Changeset 8448 for extensions/FacebookPlug

Timestamp:

Jan 2, 2011, 11:39:49 PM (13 years ago)

Author:

rub

Message:

Replace language by locale

Location:

extensions/FacebookPlug/Plugin

Files:

• include/header.inc.php (modified) (2 diffs)
• tpl/init.fb.tpl (modified) (2 diffs)

extensions/FacebookPlug/Plugin/include/header.inc.php

@@ -24 +24 @@
 }
 
-function fbp_get_fb_language()
+function fbp_get_fb_locale()
 {
   global $user;
 
   // Array compute by plugins/FacebookPlug/tools/check_language.php script
-  $valid_fb_languages = array ( 0 => 'ca_ES', 1 => 'cs_CZ', 2 => 'da_DK', 3 => 'de_DE', 4 => 'es_ES', 5 => 'fa_IR', 6 => 'fr_CA', 7 => 'fr_FR', 8 => 'he_IL', 9 => 'hr_HR', 10 => 'hu_HU', 11 => 'it_IT', 12 => 'ja_JP', 13 => 'ka_GE', 14 => 'lv_LV', 15 => 'mk_MK', 16 => 'nl_NL', 17 => 'pl_PL', 18 => 'pt_BR', 19 => 'pt_PT', 20 => 'ro_RO', 21 => 'ru_RU', 22 => 'sk_SK', 23 => 'sr_RS', 24 => 'sv_SE', 25 => 'tr_TR', 26 => 'vi_VN', 27 => 'zh_CN', );
+  $valid_fb_locales = array ( 0 => 'ca_ES', 1 => 'cs_CZ', 2 => 'da_DK', 3 => 'de_DE', 4 => 'es_ES', 5 => 'fa_IR', 6 => 'fr_CA', 7 => 'fr_FR', 8 => 'he_IL', 9 => 'hr_HR', 10 => 'hu_HU', 11 => 'it_IT', 12 => 'ja_JP', 13 => 'ka_GE', 14 => 'lv_LV', 15 => 'mk_MK', 16 => 'nl_NL', 17 => 'pl_PL', 18 => 'pt_BR', 19 => 'pt_PT', 20 => 'ro_RO', 21 => 'ru_RU', 22 => 'sk_SK', 23 => 'sr_RS', 24 => 'sv_SE', 25 => 'tr_TR', 26 => 'vi_VN', 27 => 'zh_CN', );
 
   // User language
   $language = $user['language'];
-  if (! in_array($language, $valid_fb_languages))
+  if (! in_array($language, $valid_fb_locales))
   {
     $code_lang = substr($language, 0, 2);
     // Compose a language
     $language = $code_lang.'_'.strtoupper($code_lang);
-    if (! in_array($language, $valid_fb_languages))
+    if (! in_array($language, $valid_fb_locales))
     {
       // Search a language
-      foreach ($valid_fb_languages as $valid_fb_language)
+      foreach ($valid_fb_locales as $valid_fb_locale)
       {
-        if ($code_lang == substr($valid_fb_language, 0, 2))
+        if ($code_lang == substr($valid_fb_locale, 0, 2))
         {
-          return $valid_fb_language;
+          return $valid_fb_locale;
         }
       }
@@ -84 +84 @@
     $template->assign('FACEBOOK_APP_ID', (is_numeric($conf['fbp']['facebook_app_id']) ? $conf['fbp']['facebook_app_id'] : FACEBOOK_APP_ID));
     // define language
-    $template->assign('FACEBOOK_LANGUAGE', fbp_get_fb_language());
+    $template->assign('FACEBOOK_LOCALE', fbp_get_fb_locale());
     $template->assign('FBP_PATH', FBP_PATH);
     $template->assign('FBP_SCRIPT_BASENAME', script_basename());

extensions/FacebookPlug/Plugin/tpl/init.fb.tpl

@@ -38 +38 @@
   (function() {ldelim}
     var e = document.createElement(script);
-    e.src = document.location.protocol + //connect.facebook.net/{$FACEBOOK_LANGUAGE}/all.js#appId={$FACEBOOK_APP_ID}&xfbml=1;
+    e.src = document.location.protocol + //connect.facebook.net/{$FACEBOOK_LOCALE}/all.js#appId={$FACEBOOK_APP_ID}&xfbml=1;
     e.async = true;
     document.getElementById(fb-root).appendChild(e);
@@ -45 +45 @@
 {else}
 <div id="fb-root"></div>
-<script src="http://connect.facebook.net/{$FACEBOOK_LANGUAGE}/all.js#appId={$FACEBOOK_APP_ID}&amp;xfbml=1"></script>
+<script src="http://connect.facebook.net/{$FACEBOOK_LOCALE}/all.js#appId={$FACEBOOK_APP_ID}&amp;xfbml=1"></script>
 <script>
   FB.init({ldelim}