Changeset 8653 for extensions/FacebookPlug

Timestamp:

Jan 13, 2011, 11:37:05 PM (14 years ago)

Author:

rub

Message:

Fix Arabic language
Fix picture buttons without social plugin

Location:

extensions/FacebookPlug/Plugin

Files:

• include/header.inc.php (modified) (2 diffs)
• include/picture.inc.php (modified) (1 diff)
• tools/check_language.php (modified) (1 diff)

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

@@ -29 +29 @@
 
   // Array compute by plugins/FacebookPlug/tools/check_language.php script
-  $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', );
+  $valid_fb_locales = array ( 0 => 'ar_AR', 1 => 'ca_ES', 2 => 'cs_CZ', 3 => 'da_DK', 4 => 'de_DE', 5 => 'es_ES', 6 => 'fa_IR', 7 => 'fr_CA', 8 => 'fr_FR', 9 => 'he_IL', 10 => 'hr_HR', 11 => 'hu_HU', 12 => 'it_IT', 13 => 'ja_JP', 14 => 'ka_GE', 15 => 'lv_LV', 16 => 'mk_MK', 17 => 'nl_NL', 18 => 'pl_PL', 19 => 'pt_BR', 20 => 'pt_PT', 21 => 'ro_RO', 22 => 'ru_RU', 23 => 'sk_SK', 24 => 'sr_RS', 25 => 'sv_SE', 26 => 'tr_TR', 27 => 'vi_VN', 28 => 'zh_CN', );
 
   // User language
-  $language = $user['language'];
-  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_locales))
-    {
-      // Search a language
+  $locale = $user['language'];
+  if (! in_array($locale, $valid_fb_locales))
+  {
+    $code_lang = substr($locale, 0, 2);
+    // Compose a locale
+    $locale = $code_lang.'_'.strtoupper($code_lang);
+    if (! in_array($locale, $valid_fb_locales))
+    {
+      // Search a locale
       foreach ($valid_fb_locales as $valid_fb_locale)
       {
@@ -48 +48 @@
         }
       }
-      // default language
-      $language = 'en_US';
-    }
-  }
-
-  return $language;
+      // default locale
+      $locale = 'en_US';
+    }
+  }
+
+  return $locale;
 }
 

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

@@ -30 +30 @@
   if ($page['fbp']['do_facebook_init'])
   {
-    // Header for each page
-    //~ $tpls[] = 'picture.header';
+    // Init array
+    $tpls = array();
 
     // Specific

extensions/FacebookPlug/Plugin/tools/check_language.php

@@ -31 +31 @@
   if (!is_link($path) and is_dir($path) and file_exists($path.'/iso.txt'))
   {
-    echo '<br />'.$file.'<br />'.'-------'.'<br />';
-    $file_connect = 'http://connect.facebook.net/'.$file.'/all.js';
-    echo $file_connect.'<br />';
+    $locale = $file;
+    $languages['list'][] = $locale;
 
-    $content = @file_get_contents($file_connect);
-    if ($content !== false and ! preg_match('/is not a valid locale/', $content))
-    {
-      echo 'ok'.'<br />';
-      $languages['ok'][] = $file;
-    }
-    else
-    {
-      echo 'ko'.'<br />';
-      $languages['ko'][] = $file;
-    }
+    $code_lang = substr($locale, 0, 2);
+    // Compose a locale
+    $locale = $code_lang.'_'.strtoupper($code_lang);
+    $languages['list'][] = $locale;
   }
 }
 closedir($dir);
+
+foreach (array_unique($languages['list']) as $locale)
+{
+  echo '<br />'.$locale.'<br />'.'-------'.'<br />';
+  $locale_connect = 'http://connect.facebook.net/'.$locale.'/all.js';
+  echo $locale_connect.'<br />';
+
+  $content = @file_get_contents($locale_connect);
+  if ($content !== false and ! preg_match('/is not a valid locale/', $content))
+  {
+    echo 'ok'.'<br />';
+    $languages['ok'][] = $locale;
+  }
+  else
+  {
+    echo 'ko'.'<br />';
+    $languages['ko'][] = $locale;
+  }
+}
+
 @asort($languages['ok']);
 @asort($languages['ko']);