Changeset 66510e2 in github

Timestamp:

May 9, 2012 7:52:28 AM (13 months ago)

Author:

Aleksander Machniak <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo

Children:

69cdf7b

Parents:

644f00d (diff), b546b0d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge pull request #1 from Brianetta/de-svn

Change version text to reflect new versioning system

Files:

• index.php (modified) (1 diff)
• installer/index.php (modified) (1 diff)
• program/include/iniset.php (modified) (1 diff)
• CHANGELOG (modified) (1 diff)
• program/include/rcube.php (modified) (1 diff)
• program/include/rcube_plugin.php (modified) (1 diff)
• program/js/app.js (modified) (1 diff)
• program/steps/mail/func.inc (modified) (1 diff)

index.php

@@ -3 +3 @@
  +-------------------------------------------------------------------------+
  | Roundcube Webmail IMAP Client                                           |
- | Version 0.9-svn                                                         |
+ | Version 0.9-git                                                         |
  |                                                                         |
  | Copyright (C) 2005-2012, The Roundcube Dev Team                         |

installer/index.php

@@ -4 +4 @@
  +-------------------------------------------------------------------------+
  | Roundcube Webmail setup tool                                            |
- | Version 0.9-svn                                                         |
+ | Version 0.9-git                                                         |
  |                                                                         |
  | Copyright (C) 2009-2012, The Roundcube Dev Team                         |

program/include/iniset.php

@@ -41 +41 @@
 
 // application constants
-define('RCMAIL_VERSION', '0.9-svn');
+define('RCMAIL_VERSION', '0.9-git');
 define('RCMAIL_CHARSET', 'UTF-8');
 define('RCMAIL_START', microtime(true));

CHANGELOG

@@ -2 +2 @@
 ===========================
 
-
+- Use similar language as a fallback for plugin localization (#1488401)
 - Fix issue where signature wasn't re-added on draft compose (#1488322)
 - Update to TinyMCE 3.5 (#1488459)

program/include/rcube.php

@@ -632 +632 @@
 
       // include user language files
-      if ($lang != 'en' && is_dir(INSTALL_PATH . 'program/localization/' . $lang)) {
+      if ($lang != 'en' && $lang != 'en_US' && is_dir(INSTALL_PATH . 'program/localization/' . $lang)) {
         include_once(INSTALL_PATH . 'program/localization/' . $lang . '/labels.inc');
         include_once(INSTALL_PATH . 'program/localization/' . $lang . '/messages.inc');

program/include/rcube_plugin.php

@@ -154 +154 @@
   {
     $domain = $this->ID;
-
-    $lang = $_SESSION['language'];
+    $lang   = $_SESSION['language'];
+    $langs  = array_unique(array('en_US', $lang));
     $locdir = slashify(realpath(slashify($this->home) . $dir));
-    $texts = array();
+    $texts  = array();
+
+    // Language aliases used to find localization in similar lang, see below
+    $aliases = array(
+        'de_CH' => 'de_DE',
+        'es_AR' => 'es_ES',
+        'fa_AF' => 'fa_IR',
+        'nl_BE' => 'nl_NL',
+        'pt_BR' => 'pt_PT',
+        'zh_CN' => 'zh_TW',
+    );
 
     // use buffering to handle empty lines/spaces after closing PHP tag
     ob_start();
 
-    foreach (array('en_US', $lang) as $lng) {
+    foreach ($langs as $lng) {
       $fpath = $locdir . $lng . '.inc';
       if (is_file($fpath) && is_readable($fpath)) {
-        include($fpath);
+        include $fpath;
         $texts = (array)$labels + (array)$messages + (array)$texts;
+      }
+      else if ($lng != 'en_US') {
+        // Find localization in similar language (#1488401)
+        $alias = null;
+        if (!empty($aliases[$lng])) {
+          $alias = $aliases[$lng];
+        }
+        else if ($key = array_search($lng, $aliases)) {
+          $alias = $key;
+        }
+
+        if (!empty($alias)) {
+          $fpath = $locdir . $alias . '.inc';
+          if (is_file($fpath) && is_readable($fpath)) {
+            include $fpath;
+            $texts = (array)$labels + (array)$messages + (array)$texts;
+          }
+        }
       }
     }

program/js/app.js

@@ -768 +768 @@
       case 'always-load':
         if (this.env.uid && this.env.sender) {
-          this.add_contact(urlencode(this.env.sender));
+          this.add_contact(this.env.sender);
           setTimeout(function(){ ref.command('load-images'); }, 300);
           break;

program/steps/mail/func.inc

@@ -1341 +1341 @@
         $address = html::span(null, $address . html::a(array(
             'href' => "#add",
-            'onclick' => sprintf("return %s.command('add-contact','%s',this)", JS_OBJECT_NAME, urlencode($string)),
+            'onclick' => sprintf("return %s.command('add-contact','%s',this)", JS_OBJECT_NAME, $string),
             'title' => rcube_label('addtoaddressbook'),
             'class' => 'rcmaddcontact',