#39

- fixes and improvements in lang cleaning script
- langs cleaning in modules

modules/boonex/developer/install/langs/en.xml

@@ -21,10 +21,8 @@
     <string name="_bx_dev_frm_txt_pre_lists_gl_values"><![CDATA[Values]]></string>
     <string name="_bx_dev_frm_txt_pre_lists_gl_use_for_sets"><![CDATA[Use For Sets]]></string>
     <string name="_bx_dev_frm_txt_pre_values_gl_lkey"><![CDATA[Title]]></string>
-    <string name="_bx_dev_frm_txt_pre_values_gl_lkey2"><![CDATA[Additional Title]]></string>
     <string name="_bx_dev_frm_btn_forms_gl_create"><![CDATA[Add New Form]]></string>
     <string name="_bx_dev_frm_btn_displays_gl_create"><![CDATA[Add New Display]]></string>
-    <string name="_bx_dev_frm_btn_fields_gl_visible"><![CDATA[Visibile For]]></string>
     <string name="_bx_dev_frm_btn_fields_create"><![CDATA[Add New Field]]></string>
     <string name="_bx_dev_frm_btn_pre_lists_create"><![CDATA[Add New List]]></string>
     <string name="_bx_dev_frm_btn_pre_values_create"><![CDATA[Add New Item]]></string>
@@ -156,19 +154,9 @@
     <string name="_bx_dev_frm_txt_prevalues_lkey2"><![CDATA[Title Additional]]></string>
     <string name="_bx_dev_frm_btn_sys_prevalues_add"><![CDATA[Add]]></string>
     <string name="_bx_dev_frm_btn_prevalues_add"><![CDATA[Add]]></string>
-    <string name="_bx_dev_frm_btn_prevalues_save"><![CDATA[Save]]></string>
     <string name="_bx_dev_frm_btn_sys_prevalues_cancel"><![CDATA[Cancel]]></string>
     <string name="_bx_dev_frm_btn_prevalues_cancel"><![CDATA[Cancel]]></string>
-    <string name="_bx_dev_frm_err_prevalues_create_forbidden"><![CDATA[This list is already used. It's impossible to add non-numeric, or less than 1, or more than {0} values in it.]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    
+    <string name="_bx_dev_frm_err_prevalues_create_forbidden"><![CDATA[This list is already used. It's impossible to add non-numeric, or less than 1, or more than {0} values in it.]]></string>    
 
     <!-- Navigation Builder -->
     <string name="_bx_dev_nav_txt_menus_gl_title"><![CDATA[System Name]]></string>
@@ -182,8 +170,6 @@
     <string name="_bx_dev_nav_txt_items_gl_icon"><![CDATA[Icon]]></string>
     <string name="_bx_dev_nav_txt_items_gl_title_system"><![CDATA[System Name]]></string>
     <string name="_bx_dev_nav_txt_items_gl_link"><![CDATA[URL]]></string>
-    <string name="_bx_dev_nav_txt_items_gl_link_menu"><![CDATA[Menu:]]></string>
-    <string name="_bx_dev_nav_txt_items_gl_link_custom"><![CDATA[Custom Action]]></string>
     <string name="_bx_dev_nav_txt_items_gl_module"><![CDATA[Module]]></string>
     <string name="_bx_dev_nav_txt_items_gl_visible"><![CDATA[Visibile For]]></string>
     <string name="_bx_dev_nav_btn_menus_gl_create"><![CDATA[Add New Menu]]></string>
@@ -193,7 +179,6 @@
     <string name="_bx_dev_nav_btn_items_gl_import"><![CDATA[Import Items]]></string>
     <string name="_bx_dev_nav_btn_items_gl_visible"><![CDATA[Visibile For]]></string>
     <string name="_bx_dev_nav_txt_select_module"><![CDATA[Select Module...]]></string>
-    <string name="_bx_dev_nav_txt_select_set"><![CDATA[Select Set...]]></string>
     <string name="_bx_dev_nav_txt_menus_create_popup"><![CDATA[Add New Menu]]></string>
     <string name="_bx_dev_nav_err_menus_create"><![CDATA[Cannot add menu]]></string>
     <string name="_bx_dev_nav_txt_menus_edit_popup"><![CDATA[Edit "{0}" Menu]]></string>
@@ -254,7 +239,6 @@
     <string name="_bx_dev_nav_txt_sets_deletable"><![CDATA[Deletable]]></string>
     <string name="_bx_dev_nav_btn_sys_sets_add"><![CDATA[Add]]></string>
     <string name="_bx_dev_nav_btn_sets_add"><![CDATA[Add]]></string>
-    <string name="_bx_dev_nav_btn_sets_save"><![CDATA[Save]]></string>
     <string name="_bx_dev_nav_btn_sys_sets_cancel"><![CDATA[Cancel]]></string>
     <string name="_bx_dev_nav_btn_sets_cancel"><![CDATA[Cancel]]></string>
     <string name="_bx_dev_nav_txt_items_create_popup"><![CDATA[Add New Item]]></string>
@@ -279,7 +263,6 @@
     <string name="_bx_dev_nav_err_items_title_system"><![CDATA[You need to enter a value here]]></string>
     <string name="_bx_dev_nav_txt_sys_items_title"><![CDATA[Title]]></string>
     <string name="_bx_dev_nav_txt_items_title"><![CDATA[Title]]></string>
-    <string name="_bx_dev_nav_err_items_title"><![CDATA[You need to enter a value here]]></string>
     <string name="_bx_dev_nav_txt_sys_items_link"><![CDATA[Link]]></string>
     <string name="_bx_dev_nav_txt_items_link"><![CDATA[Link]]></string>
     <string name="_bx_dev_nav_txt_sys_items_onclick"><![CDATA[OnClick]]></string>
@@ -358,7 +341,6 @@
     <string name="_bx_dev_bp_err_block_title"><![CDATA[You need to enter a value here]]></string>
     <string name="_bx_dev_bp_txt_sys_block_designbox_id"><![CDATA[Layout]]></string>
     <string name="_bx_dev_bp_txt_block_designbox_id"><![CDATA[Layout]]></string>
-    <string name="_bx_dev_bp_txt_block_designbox_id_select"><![CDATA[Select Layout...]]></string>
     <string name="_bx_dev_bp_err_block_designbox_id"><![CDATA[You need to select a layout]]></string>
     <string name="_bx_dev_bp_txt_sys_block_visible_for"><![CDATA[Visible For]]></string>
     <string name="_bx_dev_bp_txt_block_visible_for"><![CDATA[Visible For]]></string>
@@ -366,8 +348,6 @@
     <string name="_bx_dev_bp_txt_block_visible_for_selected"><![CDATA[Selected levels]]></string>
     <string name="_bx_dev_bp_txt_sys_block_visible_for_levels"><![CDATA[Select Levels]]></string>
     <string name="_bx_dev_bp_txt_block_visible_for_levels"><![CDATA[Select Levels]]></string>
-    <string name="_bx_dev_bp_txt_sys_block_content"><![CDATA[Content]]></string>
-    <string name="_bx_dev_bp_txt_block_content"><![CDATA[Content]]></string>
     <string name="_bx_dev_bp_txt_block_content_service"><![CDATA[Code]]></string>
     <string name="_bx_dev_bp_txt_sys_block_deletable"><![CDATA[Deletable]]></string>
     <string name="_bx_dev_bp_txt_block_deletable"><![CDATA[Deletable]]></string>
@@ -387,35 +367,9 @@
     <string name="_bx_dev_pgt_txt_manage_gl_title"><![CDATA[Module]]></string>
     <string name="_bx_dev_pgt_btn_manage_gl_recompile"><![CDATA[Recompile All]]></string>
     <string name="_bx_dev_pgt_btn_manage_gl_restore"><![CDATA[Restore All]]></string>
-    <string name="_bx_dev_pgt_txt_manage_recompile_title_sing"><![CDATA[Recompile %s languege for %s module.]]></string>
-    <string name="_bx_dev_pgt_txt_manage_restore_title_sing"><![CDATA[Restore %s languege for %s module.]]></string>
-    <string name="_bx_dev_pgt_txt_manage_recompile_title_plur"><![CDATA[Recompile %s languege for all modules.]]></string>
-    <string name="_bx_dev_pgt_txt_manage_restore_title_plur"><![CDATA[Restore %s languege for all modules.]]></string>
+    <string name="_bx_dev_pgt_txt_manage_recompile_title_sing"><![CDATA[Recompile %s language for %s module.]]></string>
+    <string name="_bx_dev_pgt_txt_manage_restore_title_sing"><![CDATA[Restore %s language for %s module.]]></string>
+    <string name="_bx_dev_pgt_txt_manage_recompile_title_plur"><![CDATA[Recompile %s language for all modules.]]></string>
+    <string name="_bx_dev_pgt_txt_manage_restore_title_plur"><![CDATA[Restore %s language for all modules.]]></string>
     <string name="_bx_dev_pgt_txt_manage_modules_all"><![CDATA[All]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-    <string name=""><![CDATA[]]></string>
-</resources>
+</resources>

modules/boonex/notes/install/langs/en.xml

@@ -53,7 +53,6 @@
 	<string name="_bx_notes_page_title_sys_view_note"><![CDATA[View Note]]></string>
 	<string name="_bx_notes_page_title_view_note"><![CDATA[{title}]]></string>
 	<string name="_bx_notes_page_block_title_note_text"><![CDATA[Note Text]]></string>
-	<string name="_bx_notes_page_block_title_note_menu"><![CDATA[Note Menu]]></string>
 	<string name="_bx_notes_page_title_browse"><![CDATA[Notes]]></string>
 	<string name="_bx_notes_page_title_search_results"><![CDATA[Notes matching "{0}"]]></string>
 	<string name="_bx_notes_page_title_browse_by_author"><![CDATA[Notes of {display_name}]]></string>

modules/boonex/persons/install/langs/en.xml

@@ -13,7 +13,6 @@
 	<string name="_bx_persons_form_person_display_delete"><![CDATA[Delete Person]]></string>
 	<string name="_bx_persons_form_person_display_view"><![CDATA[View Person]]></string>
 	<string name="_bx_persons_form_person_input_sys_do_submit"><![CDATA[Submit]]></string>
-	<string name="_bx_persons_form_person_input_do_submit"><![CDATA[Submit]]></string>
 	<string name="_bx_persons_form_person_input_sys_fullname"><![CDATA[Full Name]]></string>
 	<string name="_bx_persons_form_person_input_fullname"><![CDATA[Full Name]]></string>
 	<string name="_bx_persons_form_person_input_fullname_err"><![CDATA[This information is essential. Please, fill in this field.]]></string>
@@ -33,7 +32,6 @@
 	<string name="_bx_persons_form_person_input_delete_confirm"><![CDATA[I am sure I want to delete this profile]]></string>
 	<string name="_bx_persons_form_person_input_delete_confirm_info"><![CDATA[This action can not be undone.]]></string>
 	<string name="_bx_persons_form_person_input_delete_confirm_error"><![CDATA[Please check this checkbox if you really want to delete your profile.]]></string>
-	<string name="_bx_persons_form_person_input_picture_btn_upload"><![CDATA[Choose Picture]]></string>
     <string name="_bx_persons_form_person_input_picture_txt_new"><![CDATA[New Picture]]></string>
     <string name="_bx_persons_form_person_input_picture_txt_discard"><![CDATA[Discard]]></string>
     <string name="_bx_persons_form_person_input_picture_txt_current"><![CDATA[Current Picture]]></string>
@@ -65,7 +63,6 @@
 	<string name="_bx_persons_page_block_title_profile_info"><![CDATA[Info]]></string>
 	<string name="_bx_persons_page_block_title_profile_friends"><![CDATA[Friends]]></string>
 	<string name="_bx_persons_page_block_title_profile_cover"><![CDATA[Profile Cover]]></string>
-	<string name="_bx_persons_page_block_title_profile_menu"><![CDATA[Menu]]></string>
 	<string name="_bx_persons_page_block_title_profile_actions"><![CDATA[Actions]]></string>
 	<string name="_bx_persons_page_block_title_latest_persons"><![CDATA[Recent Persons]]></string>
 

modules/boonex/timeline/install/langs/en.xml

@@ -33,7 +33,6 @@
 	<string name="_bx_timeline_form_attach_link_input_url_err"><![CDATA[Correct Link is essential. Please, fill in this field.]]></string>
 	<string name="_bx_timeline_form_attach_link_input_sys_do_submit"><![CDATA[Add]]></string>
 	<string name="_bx_timeline_form_attach_link_input_do_submit"><![CDATA[Add]]></string>
-	<string name="_bx_timeline_form_attach_link_input_sys_do_cancel"><![CDATA[Close]]></string>
 	<string name="_bx_timeline_form_attach_link_input_do_cancel"><![CDATA[Close]]></string>
 
 	<string name="_bx_timeline_acl_action_post"><![CDATA[Post]]></string>
@@ -59,14 +58,6 @@
     <string name="_bx_timeline_menu_item_view_other"><![CDATA[Posts by others]]></string>
     <string name="_bx_timeline_menu_item_get_rss"><![CDATA[RSS]]></string>
 
-	<string name="_bx_timeline_menu_title_post"><![CDATA[Post Item]]></string>
-    <string name="_bx_timeline_menu_set_title_post"><![CDATA[Post Item]]></string>
-    <string name="_bx_timeline_menu_item_title_system_post_text"><![CDATA[Post Text]]></string>
-    <string name="_bx_timeline_menu_item_title_post_text"><![CDATA[Write]]></string>
-    <string name="_bx_timeline_menu_item_title_system_post_link"><![CDATA[Post Link]]></string>
-    <string name="_bx_timeline_menu_item_title_post_link"><![CDATA[Share a link]]></string>
-    <string name="_bx_timeline_menu_item_title_system_post_photo"><![CDATA[Post Photo]]></string>
-    <string name="_bx_timeline_menu_item_title_post_photo"><![CDATA[Add a photo]]></string>
 
     <string name="_bx_timeline_menu_title_item_manage"><![CDATA[Manage Item]]></string>
     <string name="_bx_timeline_menu_set_title_item_manage"><![CDATA[Manage Item]]></string>
@@ -104,8 +95,6 @@
 	<string name="_bx_timeline_txt_shared"><![CDATA[Shared {0}'s {1}.]]></string>
 	<string name="_bx_timeline_txt_shared_by"><![CDATA[Shared by]]></string>
 	<string name="_bx_timeline_txt_err_cannot_share"><![CDATA[Cannot share. Please report.]]></string>
-	<string name="_bx_timeline_txt_msg_success_share"><![CDATA[]]></string>
+	<string name="_bx_timeline_txt_msg_success_share"><![CDATA[]]></string>	
 
-	<string name="_bx_timeline_txt_plus"><![CDATA[Plus]]></string>
-	
-</resources>
+</resources>

scripts/check_unused_lang.php

@@ -27,15 +27,36 @@ class BxDolCheckUnusedLangsCmd
     protected $_iLimit = 0;
     protected $_aOptionsSystem;
     protected $_aOptionsModule;
+    protected $_aAlwaysTrue;
 
     public function __construct() 
     {
+        $this->_aAlwaysTrue = array (
+            '/^_mma_/',
+            '/^_ps_group_/',
+            '/^_adm_txt_modules_/',
+            '/^_adm_ipbl_Type/',
+            '/^_week_/',
+
+            /* wall */
+            '/^_bx_timeline_alert_module_/',
+            '/^_bx_timeline_alert_action_/',
+
+            /* sites */
+            '/^_bx_sites_txt_status_/',
+            '/^_bx_sites_txt_payment_type_/',
+            '/^_bx_sites_paypal_duration_/',
+
+            /* developer */
+            '/^_bx_dev_pgt_txt_manage_/',
+        );
+
         $this->_aOptionsSystem = array (
             'dirs' => array (
                 '' => array ('*.php'),
                 'install/' => array('*.php', '*.sql'),
                 'studio/' => array('*.php', '*.html'),
-                'inc/' => array ('*.php'),
+                'inc/' => array ('*.php', '*.js'),
                 'modules/' => array('*.php', '*.html', '*.sql'),
                 'template/' => array('*.php', '*.html'),
             ),
@@ -46,9 +67,9 @@ class BxDolCheckUnusedLangsCmd
                 "modules/{module_dir}/" => array ('*.php'),
                 "modules/{module_dir}/install/sql/" => array('*.sql'),
                 "modules/{module_dir}/classes/" => array('*.php'),
-                "modules/{module_dir}/templates/" => array('*.php', '*.html'),
+                "modules/{module_dir}/js/" => array ('*.js'),
+                "modules/{module_dir}/template/" => array('*.php', '*.html'),
                 "modules/{module_dir}/inc/" => array ('*.php'),
-                "modules/{module_dir}/integrations/" => array ('*.php'),
             ),
         );
     }
@@ -108,10 +129,9 @@ class BxDolCheckUnusedLangsCmd
         }
 
         if (!$this->_bQuiet) {
-            $this->output('Found language strings: ');
-            $this->output('--------------');
+            $this->output('Found language strings:');
+            $this->output('-----------------------');
             empty($LANG_FOUND) ? $this->output('Empty') : $this->output($this->xmlExport($LANG_FOUND), false);
-            $this->output('--------------');
             $this->output('');
         }
 
@@ -121,10 +141,9 @@ class BxDolCheckUnusedLangsCmd
             file_put_contents($this->_sOutputFoundFile, $this->xmlExport($LANG_FOUND));
 
         if (!$this->_bQuiet) {
-            $this->output('Unused language strings: ');
-            $this->output('--------------');
+            $this->output('Unused language strings:');
+            $this->output('------------------------');
             empty($LANG_LOST) ? $this->output('Empty') : $this->output($this->xmlExport($LANG_LOST), false);
-            $this->output('--------------');
             $this->output('');
         }
 
@@ -147,7 +166,7 @@ class BxDolCheckUnusedLangsCmd
 
     protected function getHelp()
     {
-        $n = 20;
+        $n = 21;
         $s = "Usage: php check_unused_lang.php [options]\n";
 
         $s .= str_pad("\t -h", $n) . "Print this help\n";
@@ -170,35 +189,30 @@ class BxDolCheckUnusedLangsCmd
 
     protected function findLangKey($sKey, $aOptions)
     {
-        $aAlwaysTrue = array (
-            '/^_mma_/',
-            '/^_ps_group_/',
-            '/^_adm_txt_modules_/',
-            '/^_adm_ipbl_Type/',
-            '/^_week_/',
-
-            /* wall */
-            '/^_bx_timeline_alert_module_/',
-            '/^_bx_timeline_alert_action_/',
-
-            /* sites */
-            '/^_bx_sites_txt_status_/',
-        );
-        foreach ($aAlwaysTrue as $sReg)
+        foreach ($this->_aAlwaysTrue as $sReg)
             if (preg_match($sReg, $sKey))
                 return true;
 
         foreach ($aOptions['dirs'] as $sDir => $aExt) {
+
             $sDepth = $sDir ? '' : ' -depth 1 ';
+            if ($this->_sModule) {
+                $aDir = explode('/', $sDir);
+                $sDepth = !$sDir || $this->_sModule == ($aDir[(count($aDir) - 3)] . '/' . $aDir[(count($aDir) - 2)]) ? ' -depth 1 ' : '';
+            }
+         
             $sDir = BX_DIRECTORY_PATH_ROOT . $sDir;
+
             if (!file_exists($sDir))
                 continue;
+
             foreach ($aExt as $sExt) {
                 $sResults = `find $sDir $sDepth -name "$sExt" -exec grep "\<$sKey\>" {} \;`;
                 if ($sResults)
                     return true;
             }
         }
+
         return false;
     }