From 7edfde0fd5131a9d550f76a4d8a6acd9d3940201 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 3 May 2012 16:51:41 +0200
Subject: [PATCH] Loading english first + "Alt shift + F" in netbeans

---
 main/inc/lib/plugin.class.php | 96 +++++++++++++++--------------------
 1 file changed, 40 insertions(+), 56 deletions(-)

diff --git a/main/inc/lib/plugin.class.php b/main/inc/lib/plugin.class.php
index a90241e2ed..eaf84ccc0c 100644
--- a/main/inc/lib/plugin.class.php
+++ b/main/inc/lib/plugin.class.php
@@ -7,15 +7,13 @@
  * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html
  * @author Laurent Opprecht <laurent@opprecht.info>
  */
-class Plugin
-{
+class Plugin {
 
     protected $version = '';
     protected $author = '';
     protected $fields = array();
 
-    protected function __construct($version, $author, $settings = array())
-    {
+    protected function __construct($version, $author, $settings = array()) {
         $this->version = $version;
         $this->author = $author;
         $this->fields = $settings;
@@ -24,19 +22,16 @@ class Plugin
         $language_files[] = 'plugin_' . $this->get_name();
     }
 
-    function get_info()
-    {
+    function get_info() {
         $result = array();
 
         $result['title'] = $this->get_title();
         $result['comment'] = $this->get_comment();
         $result['version'] = $this->get_version();
         $result['author'] = $this->get_author();
-        if ($form = $this->get_settings_form())
-        {
+        if ($form = $this->get_settings_form()) {
             $result['settings_form'] = $form;
-            foreach ($this->fields as $name => $type)
-            {
+            foreach ($this->fields as $name => $type) {
                 $value = $this->get($name);
                 $result[$name] = $value;
             }
@@ -44,41 +39,34 @@ class Plugin
         return $result;
     }
 
-    function get_name()
-    {
+    function get_name() {
         $result = get_class($this);
         $result = str_replace('Plugin', '', $result);
         $result = strtolower($result);
         return $result;
     }
 
-    function get_title()
-    {
+    function get_title() {
         return $this->get_lang('plugin_title');
     }
 
-    function get_comment()
-    {
+    function get_comment() {
         return $this->get_lang('plugin_comment');
     }
 
-    function get_version()
-    {
+    function get_version() {
         return $this->version;
     }
 
-    function get_author()
-    {
+    function get_author() {
         return $this->author;
     }
 
-    function get_css()
-    {
+    function get_css() {
         $name = $this->get_name();
         $root = api_get_path(SYS_PLUGIN_PATH);
         $path = "$root/$name/resources/$name.css";
-        if (!is_readable($path))
-        {
+        if (!is_readable($path)) {
             return '';
         }
         $css = array();
@@ -91,22 +79,17 @@ class Plugin
      *
      * @return FormValidator
      */
-    function get_settings_form()
-    {
+    function get_settings_form() {
         $result = new FormValidator($this->get_name());
 
         $defaults = array();
-        foreach ($this->fields as $name => $type)
-        {
+        foreach ($this->fields as $name => $type) {
             $value = $this->get($name);
             $defaults[$name] = $value;
             $type = $type ? $type : 'text';
-            if ($type == 'wysiwyg')
-            {
+            if ($type == 'wysiwyg') {
                 $result->add_html_editor($name, $this->get_lang($name));
-            }
-            else
-            {
+            } else {
                 $result->addElement($type, $name, $this->get_lang($name));
             }
         }
@@ -116,15 +99,12 @@ class Plugin
         return $result;
     }
 
-    function get($name)
-    {
+    function get($name) {
         $content = '';
         $title = 'Static';
         $settings = $this->get_settings();
-        foreach ($settings as $setting)
-        {
-            if ($setting['variable'] == ($this->get_name() . '_' . $name))
-            {
+        foreach ($settings as $setting) {
+            if ($setting['variable'] == ($this->get_name() . '_' . $name)) {
                 return $setting['selected_value'];
             }
         }
@@ -134,10 +114,8 @@ class Plugin
 
     private $settings = null;
 
-    public function get_settings()
-    {
-        if (is_null($this->settings))
-        {
+    public function get_settings() {
+        if (is_null($this->settings)) {
             $settings = api_get_settings_params(array("subkey = ? AND category = ? AND type = ? " => array($this->get_name(), 'Plugins', 'setting')));
             $this->settings = $settings;
         }
@@ -146,31 +124,37 @@ class Plugin
 
     private $strings = null;
 
-    public function get_lang($name)
-    {
-        if (is_null($this->strings))
-        {
+    public function get_lang($name) {
+        if (is_null($this->strings)) {
             global $language_interface;
-
             $root = api_get_path(SYS_PLUGIN_PATH);
             $plugin_name = $this->get_name();
             $language = $language_interface;
             $path = "$root/$plugin_name/lang/$language.php";
-            if (is_readable($path))
-            {
-                include $path;
+
+            //1. Loading english if exists 
+            if (is_readable($path)) {
+                $english_path = "$root/$plugin_name/lang/english.php";
+                include $english_path;
                 $this->strings = $strings;
             }
-            else
-            {
+
+            //2. Loading the system language
+            if (is_readable($path)) {
+                include $path;
+                if (!empty($strings)) {
+                    foreach ($strings as $key => $string) {
+                        $this->strings[$key] = $string;
+                    }
+                }
+            } else {
                 $this->strings = array();
             }
         }
-        if (isset($this->strings[$name]))
-        {
+
+        if (isset($this->strings[$name])) {
             return $this->strings[$name];
         }
         return get_lang($name);
     }
-
 }
\ No newline at end of file