Changeset 49ab20c in github

Timestamp:

May 9, 2012 6:49:06 AM (14 months ago)

Author:

Aleksander Machniak <alec@…>

Branches:

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

Children:

644f00d

Parents:

59041fd (diff), f8c9610f (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 branch 'master' of github.com:roundcube/roundcubemail

Files:

• skins/larry/images/filetypes.png (modified) (previous)
• skins/larry/styles.css (modified) (4 diffs)
• CHANGELOG (modified) (1 diff)
• program/include/rcube.php (modified) (1 diff)
• program/include/rcube_plugin.php (modified) (1 diff)

skins/larry/styles.css

@@ -1281 +1281 @@
         width: 176px;
         margin: 0;
-        padding: 5px 26px 5px 38px;
+        padding: 5px 26px 2px 38px;
+        height: 18px;
         background: #f1f1f1;
         border-color: #a3a3a3;
@@ -1296 +1297 @@
         position: absolute;
         top: 4px;
-        right: 3px;
+        right: 1px;
 }
 
@@ -1478 +1479 @@
 a.dropdownselector {
         position: absolute;
+        padding: 1px 0;
         z-index: 1;
+}
+
+a.dropdownselector .handle {
+        margin: -1px 0;
+        padding-top: 5px;
+        min-height: 20px;
 }
 
@@ -1887 +1895 @@
 }
 
+.attachmentslist li.txt,
+.attachmentslist li.text {
+        background-position: 0 -416px;
+}
+
+.attachmentslist li.vcard {
+        background-position: 0 -390px;
+}
+
+.attachmentslist li.html {
+        background-position: 0 -442px;
+}
+
 .attachmentslist li a,
 #compose-attachments ul li {

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;
+          }
+        }
       }
     }