Changeset 20012 for extensions

Timestamp:

Jan 9, 2013, 12:03:22 AM (12 years ago)

Author:

patdenice

Message:

Languages tags differentiate [lang=fr_FR] and [lang=fr_CA]

File:

• extensions/ExtendedDescription/main.inc.php (modified) (1 diff)

extensions/ExtendedDescription/main.inc.php

@@ -33 +33 @@
   {
     global $user;
-    $user_lang = substr($user['language'], 0, 2);
-  }
-
-  if (!substr_count(strtolower($desc), '[lang=' . $user_lang . ']'))
+    $user_lang = $user['language'];
+  }
+
+  $small_user_lang = substr($user['language'], 0, 2);
+
+  if (!preg_match('#\[lang=('.$user_lang.'|'.$small_user_lang.')\]#i', $desc))
   {
     $user_lang = 'default';
-  }
-
-  if (substr_count(strtolower($desc), '[lang=' . $user_lang . ']'))
+    $small_user_lang = 'default';
+  }
+
+  if (preg_match('#\[lang=('.$user_lang.'|'.$small_user_lang.')\]#i', $desc))
   {
     // la balise avec la langue de l'utilisateur a été trouvée
-    $patterns[] = '#(^|\[/lang\])(.*?)(\[lang=(' . $user_lang . '|all)\]|$)#is';
+    $patterns[] = '#(^|\[/lang\])(.*?)(\[lang=(' . $user_lang . '|' . $small_user_lang . '|all)\]|$)#is';
     $replacements[] = '';
-    $patterns[] = '#\[lang=(' . $user_lang . '|all)\](.*?)\[/lang\]#is';
+    $patterns[] = '#\[lang=(' . $user_lang . '|' . $small_user_lang . '|all)\](.*?)\[/lang\]#is';
     $replacements[] = '\\1';
   }