Support skin localization (#5853)

CHANGELOG

@@ -52,6 +52,7 @@ CHANGELOG Roundcube Webmail
   - Support for 'link' objects
   - Support including files with path relative to templates directory
   - Use <button> instead of <input> for submit button on logon screen
+- Support skin localization (#5853)
 - Reset onerror on images if placeholder does not exist to prevent from requests storm
 - Unified and simplified code for loading content frame for responses and identities
 - Display contact import and advanced search in popup dialogs

program/include/rcmail_output_html.php

@@ -307,6 +307,13 @@ EOF;
             $value = array_merge((array) $this->config->get('dont_override'), array_keys($meta['config']));
             $this->config->set('dont_override', $value, true);
         }
+
+        if (!empty($meta['localization'])) {
+            $locdir = $meta['localization'] === true ? 'localization' : $meta['localization'];
+            if ($texts = $this->app->read_localization(RCUBE_INSTALL_PATH . $skin_path . '/' . $locdir)) {
+                $this->app->load_language($_SESSION['language'], $texts);
+            }
+        }
     }
 
     /**

program/lib/Roundcube/rcube.php

@@ -648,9 +648,9 @@ class rcube
             }
         }
         // specified domain
-        else if ($domain) {
+        else if ($domain && isset($this->texts[$domain.'.'.$name])) {
             $ref_domain = $domain;
-            return isset($this->texts[$domain.'.'.$name]);
+            return true;
         }
 
         return false;
@@ -710,6 +710,65 @@ class rcube
         }
     }
 
+    /**
+     * Read localized texts from an additional location (plugins, skins).
+     * Then you can use the result as 2nd arg to load_language().
+     *
+     * @param string $dir Directory to search in
+     *
+     * @return array Localization texts
+     */
+    public function read_localization($dir)
+    {
+        $lang   = $_SESSION['language'];
+        $langs  = array_unique(array('en_US', $lang));
+        $locdir = slashify($dir);
+        $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 ($langs as $lng) {
+            $fpath = $locdir . $lng . '.inc';
+            if (is_file($fpath) && is_readable($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;
+                    }
+                }
+            }
+        }
+
+        ob_end_clean();
+
+        return $texts;
+    }
+
     /**
      * Check the given string and return a valid language code
      *

program/lib/Roundcube/rcube_plugin.php

@@ -199,62 +199,19 @@ abstract class rcube_plugin
      */
     public function add_texts($dir, $add2client = false)
     {
-        $domain = $this->ID;
-        $lang   = $_SESSION['language'];
-        $langs  = array_unique(array('en_US', $lang));
-        $locdir = slashify(realpath(slashify($this->home) . $dir));
-        $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 ($langs as $lng) {
-            $fpath = $locdir . $lng . '.inc';
-            if (is_file($fpath) && is_readable($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;
-                    }
-                }
-            }
-        }
-
-        ob_end_clean();
+        $rcube = rcube::get_instance();
+        $texts = $rcube->read_localization(realpath(slashify($this->home) . $dir));
 
         // prepend domain to text keys and add to the application texts repository
         if (!empty($texts)) {
-            $add = array();
+            $domain = $this->ID;
+            $add    = array();
+
             foreach ($texts as $key => $value) {
                 $add[$domain.'.'.$key] = $value;
             }
 
-            $rcube = rcube::get_instance();
-            $rcube->load_language($lang, $add);
+            $rcube->load_language($_SESSION['language'], $add);
 
             // add labels to client
             if ($add2client && method_exists($rcube->output, 'add_label')) {
@@ -264,6 +221,7 @@ abstract class rcube_plugin
                 else {
                     $js_labels = array_keys($add);
                 }
+
                 $rcube->output->add_label($js_labels);
             }
         }