Changeset 5156 for trunk/include/functions.inc.php

Timestamp:

Mar 17, 2010, 10:22:51 AM (14 years ago)

Author:

nikrou

Message:

Revert gettext stuff.
Keep english values for language keys translation.
Provide a script to use english values for key in language files.

Todo : provide a script (to help transition) to keep using
original keys in language files for translators.

File:

• trunk/include/functions.inc.php (modified) (3 diffs)

trunk/include/functions.inc.php

@@ -31 +31 @@
 include_once( PHPWG_ROOT_PATH .'include/functions_url.inc.php' );
 include_once( PHPWG_ROOT_PATH .'include/functions_plugins.inc.php' );
-include_once( PHPWG_ROOT_PATH .'include/php-gettext/gettext.inc.php' );
 
 //----------------------------------------------------------- generic functions
@@ -873 +872 @@
 function l10n($key, $textdomain='messages')
 {
-  global $user;
-
-  if (empty($user['language']))
-  {
-    $locale = $GLOBALS['language'];
-  } 
-  else 
-  {
-    $locale = $user['language'];
-  }
-
-  T_setlocale(LC_ALL, $locale.'.UTF-8');
-
-  // Specify location of translation tables
-  T_bindtextdomain($textdomain, "./language");
-
-  // Choose domain
-  T_textdomain($textdomain);
-  
-  return T_gettext($key);
+  global $lang, $conf;
+
+  if ($conf['debug_l10n'] and !isset($lang[$key]) and !empty($key))
+  {
+    trigger_error('[l10n] language key "'.$key.'" is not defined', E_USER_WARNING);
+  }
+
+  return isset($lang[$key]) ? $lang[$key] : $key;
 }
 
@@ -904 +891 @@
  * @return string
  */
-function l10n_dec($singular_fmt_key, $plural_fmt_key, 
-                  $decimal, $textdomain='messages')
-{
-  global $user;
-
-  if (empty($user['language']))
-  {
-    $locale = $GLOBALS['language'];
-  } 
-  else 
-  {
-    $locale = $user['language'];
-  }
-
-  T_setlocale(LC_ALL, $locale.'.UTF-8');
-
-  // Specify location of translation tables
-  T_bindtextdomain($textdomain, "./language");
-
-  // Choose domain
-  T_textdomain($textdomain);
-
-  return sprintf(T_ngettext($singular_fmt_key, 
-                            $plural_fmt_key, 
-                            $decimal),
-                 $decimal
-                 );
+function l10n_dec($singular_fmt_key, $plural_fmt_key, $decimal)
+{
+  global $lang_info;
+
+  return
+    sprintf(
+      l10n((
+        (($decimal > 1) or ($decimal == 0 and $lang_info['zero_plural']))
+          ? $plural_fmt_key
+          : $singular_fmt_key
+        )), $decimal);
 }