From c3d848317fb31e12b6262d9dc6f567ff3317f3ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Mon, 13 Feb 2017 07:37:41 +0100 Subject: [PATCH 01/13] Update lan_notify.php --- e107_admin/notify.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e107_admin/notify.php b/e107_admin/notify.php index e376d1ff4..00b50709c 100644 --- a/e107_admin/notify.php +++ b/e107_admin/notify.php @@ -359,7 +359,7 @@ class plugin_notify_admin_ui extends e_admin_ui if(isset($this->notify_prefs['event'][$id]['class']) && $this->notify_prefs['event'][$id]['class'] != e_UC_NOBODY) { - $text .= $frm->button('test['.$id.']', $id, 'confirm', 'Test'); + $text .= $frm->button('test['.$id.']', $id, 'confirm', LAN_TEST); } @@ -939,7 +939,7 @@ class notify_config if(isset($this->notify_prefs['event'][$id]['class']) && $this->notify_prefs['event'][$id]['class'] != e_UC_NOBODY) { - $text .= $frm->button('test['.$id.']', $id, 'confirm', 'Test'); + $text .= $frm->button('test['.$id.']', $id, 'confirm', LAN_TEST); } From 8ba0dd96459e9396c8b35a21307d917130679d32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Mon, 13 Feb 2017 07:39:18 +0100 Subject: [PATCH 02/13] Update users.php --- e107_admin/users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e107_admin/users.php b/e107_admin/users.php index 2702883ec..8ec870817 100644 --- a/e107_admin/users.php +++ b/e107_admin/users.php @@ -268,7 +268,7 @@ class users_admin_ui extends e_admin_ui */ protected $disallow = array('create'); - protected $tabs = array('Basic', 'Extended'); + protected $tabs = array(LAN_BASIC, LAN_EXTENDED); //TODO - finish 'user' type, set 'data' to all editable fields, set 'noedit' for all non-editable fields protected $fields = array( From db59f2f966828d5e085c383a22502947eb2a4e42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Mon, 13 Feb 2017 07:44:19 +0100 Subject: [PATCH 03/13] Update lan_admin.php --- e107_languages/English/admin/lan_admin.php | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php index 0c4444077..a6900e941 100644 --- a/e107_languages/English/admin/lan_admin.php +++ b/e107_languages/English/admin/lan_admin.php @@ -239,6 +239,7 @@ Below is the list of files that could potentially be malicious:"); define("LAN_CREATE","Create"); define("LAN_MANAGE","Manage"); define("LAN_UPDATE","Update"); +define("LAN_UPDATES", "Updates"); define("LAN_INSTALLED","Installed");//TODO elsewhere define("LAN_LAST_UPDATED","Last Updated"); define("LAN_UPDATE_AVAILABLE","Update Available"); @@ -320,7 +321,7 @@ define("LAN_LANG","Lang."); define("LAN_APPROVE","Approve"); define("LAN_OPTIONAL", "optional"); define("LAN_INACTIVE","Inactive"); -//define("LAN_ACTIVE","Active");//English.php +define("LAN_ACTIVATE","Activate"); define("LAN_ACCEPT","Accept"); define("LAN_PENDING","Pending"); define("LAN_SUBMITTED","Submitted"); @@ -385,7 +386,7 @@ define("LAN_PURCHASE", "Purchase "); define("LAN_DOWN_THEME", "Downloading "); define("LAN_ID", "ID"); - +define("LAN_TEST", "Test"); define("LAN_VISIBILITY", "Visibility"); @@ -455,7 +456,7 @@ define("LAN_UI_DELETE_LABEL", "Confirm Delete"); define("LAN_UI_DELETE_WARNING", "You are about to delete [x] records. Please confirm to continue."); define("LAN_UI_BATCH_CREATELINK", "Create Link"); define("LAN_UI_DELETED", "[x] record(s) successfully deleted!"); -define("LAN_UI_DELETED_FAILED", "[x] records not found and not deleted!");\ +define("LAN_UI_DELETED_FAILED", "[x] records not found and not deleted!"); define("LAN_UI_BATCH_EXPORT", "Export"); define("LAN_UI_USING_DATABASE_TABLE", "Using [x] database table"); @@ -478,7 +479,6 @@ define("LAN_CUSTOM_URL", "Custom URL"); define("LAN_CUSTOM_URL_DISABLED", "Disabled or Enter Custom URL"); define("LAN_GENERAL", "General"); -//define("LAN_GENERATE", "Generate"); //moved to English php define("LAN_GEN_PW", "Generate a password"); define("LAN_DISPL_PW", "Display the password"); define("LAN_WILL_OVERWRITE_SEF", "This will overwrite your existing SEF URL."); @@ -486,6 +486,7 @@ define("LAN_WILL_OVERWRITE_SEF", "This will overwrite your existing SEF URL."); define("LAN_CAPTION", "Caption"); define("LAN_LIMIT", "Limit"); define("LAN_BASIC", "Basic"); +define("LAN_EXTENDED", "Extended"); define("LAN_ADVANCED", "Advanced"); define("LAN_FOLDER", "Folder"); define("LAN_PERSONALIZE_ICONS", "Personalize Icons"); @@ -493,21 +494,13 @@ define("LAN_PERSONALIZE_MENUS", "Personalize Menus"); define("LAN_LATEST_COMMENTS", "Latest Comments"); define("LAN_COMMENTS_ALLOWED", "Comments Allowed"); define("LAN_PERSONALIZE", "Personalize"); -//define("LAN_SELECT_COLUMNS_TO_DISPLAY", "Select columns to display"); // Moved to lan_form_handler.php -//define("LAN_DISPLAY_COLUMNS", "Display Columns"); // Moved to lan_form_handler.php + define("LAN_SETTINGS_NOT_SAVED_NO_CHANGES_MADE", "Settings not saved as no changes were made."); define("LAN_DASHBOARD_LAYOUT", "Dashboard Layout"); -//define("LAN_AFTER_SUBMIT", "After submit:"); // Moved to lan_form_handler.php define("LAN_UNAVAILABLE", "Unavailable"); -//define("LAN_READY_UP_FOLDER_FIELDS", "Ready to use upload form fields, optional - file list view"); // Not used only debug define("LAN_NO_LABEL_PROVIDED", "No Label Provided"); define("LAN_NOT_FOUND", "Not Found!"); -//define("LAN_QUICK_VIEW", "Quick View"); // Moved to lan_form_handler.php -//define("LAN_GO_TO_USER_PROFILE", "Go to user profile"); // Moved to lan_form_handler.php -//define("LAN_MULTI_LANGUAGE_FIELD", "Multi-language field"); // Moved to lan_form_handler.php -//define("LAN_GO_TO_LIST", "go to list"); // Moved to lan_form_handler.php -//define("LAN_CREATE_ANOTHER", "create another"); // Moved to lan_form_handler.php -//define("LAN_EDIT_CURRENT", "edit current"); // Moved to lan_form_handler.php + define("LAN_MAINTENANCE", "Maintenance"); define("LAN_RETURN_TO_FRONT_PANEL", "Return to Front Panel"); define("LAN_CHANGE_LANGUAGE", "Change Language"); From a1542448d2a13721dd859d97e24cce02980eaaca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Mon, 13 Feb 2017 07:47:03 +0100 Subject: [PATCH 04/13] Update eurl.php --- e107_admin/eurl.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e107_admin/eurl.php b/e107_admin/eurl.php index e89d83a2a..b74f04fe6 100644 --- a/e107_admin/eurl.php +++ b/e107_admin/eurl.php @@ -275,7 +275,7 @@ class eurl_admin_ui extends e_admin_controller_ui )); $text .= "

" . $plg->getName() . "

" . $switch . ""; - $text .= "KeyRegular Expression + $text .= "".LAN_EURL_KEY."".LAN_EURL_REGULAR_EXPRESSION." ".LAN_URL." @@ -647,7 +647,7 @@ class eurl_admin_form_ui extends e_admin_form_ui $text .= '

- Close + '.LAN_CLOSE.'
'; From 8dc855b49b95b589ac0ce957a06f4aa2066b1ca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Mon, 13 Feb 2017 07:49:59 +0100 Subject: [PATCH 05/13] Update mailout.php --- e107_admin/mailout.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/e107_admin/mailout.php b/e107_admin/mailout.php index 79ceb5798..08c006974 100644 --- a/e107_admin/mailout.php +++ b/e107_admin/mailout.php @@ -1588,7 +1588,7 @@ class mailout_admin_form_ui extends e_admin_form_ui $preview = e_SELF."?mode=main&action=preview&id=".$id; $text .= ""; $text .= "".E_32_MAIL.""; - $text .= "".E_32_SEARCH.""; + $text .= "".E_32_SEARCH.""; $text .= $this->renderValue('options',$value,$attributes,$id); @@ -1603,7 +1603,7 @@ class mailout_admin_form_ui extends e_admin_form_ui $text = ""; $text .= "".E_32_USER.""; - $text .= "".E_32_SEARCH.""; + $text .= "".E_32_SEARCH.""; $attributes['readParms']['editClass'] = e_UC_NOBODY; $text .= $this->renderValue('options',$value,$attributes,$id); @@ -1774,7 +1774,7 @@ class mailout_recipients_form_ui extends e_admin_form_ui $preview = e_SELF."?mode=main&action=preview&id=".$eid.'&user='.$user; $text = ""; - $text .= "".E_32_SEARCH.""; + $text .= "".E_32_SEARCH.""; From 3ab55efa844838c12c84b6eaccaa247ef2d50369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Mon, 13 Feb 2017 07:51:38 +0100 Subject: [PATCH 06/13] Update menus.php --- e107_admin/menus.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e107_admin/menus.php b/e107_admin/menus.php index f06b684cf..9996ca320 100644 --- a/e107_admin/menus.php +++ b/e107_admin/menus.php @@ -991,7 +991,7 @@ class e_menu_layout
- '.LAN_GO." ".e107::getParser()->toGlyph('fa-chevron-right').''; + '.LAN_GO." ".e107::getParser()->toGlyph('fa-chevron-right').''; $menuButtonLabel = defset("MENLAN_59", "Area [x]"); From f090a3cbb68e035f26af9550a06319ad812eebcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Mon, 13 Feb 2017 07:54:47 +0100 Subject: [PATCH 07/13] Update newspost.php --- e107_admin/newspost.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php index 37c86d779..ad5a8082f 100644 --- a/e107_admin/newspost.php +++ b/e107_admin/newspost.php @@ -454,7 +454,7 @@ class news_admin_ui extends e_admin_ui 'news_allow_comments' => array('title' => LAN_COMMENTS, 'type' => 'boolean', 'data'=>'int', 'tab'=>2, 'writeParms'=>'inverse=1', 'data' => 'int', 'width' => 'auto', 'thclass' => 'center', 'class' => 'center', 'nosort' => false,'batch'=>true, 'filter'=>true,'readParms'=>'reverse=1'), 'news_comment_total' => array('title' => LAN_NEWS_60, 'type' => 'number', 'data'=>'int', 'tab'=>2, 'noedit'=>true, 'width' => '10%', 'thclass' => '', 'class' => null, 'nosort' => false), // admin_news_notify - 'news_email_notify' => array('title' => LAN_NEWS_103, 'type' => 'checkbox', 'tab'=>2, 'data'=>false, 'writeParms'=>array('show'=>1, 'tdClassRight'=>'form-inline'), 'help'=>'Trigger an email notification when you submit this form.'), + 'news_email_notify' => array('title' => LAN_NEWS_103, 'type' => 'checkbox', 'tab'=>2, 'data'=>false, 'writeParms'=>array('show'=>1, 'tdClassRight'=>'form-inline'), 'help'=>LAN_NEWS_109), 'submitted_id' => array('title' => LAN_NEWS_68, 'type' => 'hidden', 'tab'=>2, 'data'=>false, 'writeParms'=>'show=0'), 'options' => array('title' => LAN_OPTIONS, 'type' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center', 'nosort' => true, 'forced' => TRUE) @@ -1174,13 +1174,13 @@ class news_admin_ui extends e_admin_ui "; - // TODO LAN + $tab1 .= " - News Cache Timeout + ".LAN_NEWS_110." ".$frm->number('news_cache_timeout',varset($pref['news_cache_timeout'],0), 6)." -
Time in minutes. Applies only when system cache is enabled.
+
".LAN_NEWS_111."
"; From 3c8a368c7ab41213cb2eafa06dd9385704e4b763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Mon, 13 Feb 2017 07:55:52 +0100 Subject: [PATCH 08/13] Update update_routines.php --- e107_admin/update_routines.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e107_admin/update_routines.php b/e107_admin/update_routines.php index ca0f7439c..da4d9cc5b 100644 --- a/e107_admin/update_routines.php +++ b/e107_admin/update_routines.php @@ -349,7 +349,7 @@ class e107Update "; - $ns->tablerender("Updates",$mes->render() . $text); + $ns->tablerender(LAN_UPDATES,$mes->render() . $text); } From b0011f27e253725c70c9ede9af19c1d7367c2739 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Mon, 13 Feb 2017 08:03:40 +0100 Subject: [PATCH 09/13] Update notify_class.php --- e107_handlers/notify_class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e107_handlers/notify_class.php b/e107_handlers/notify_class.php index 784384132..0dc263f80 100644 --- a/e107_handlers/notify_class.php +++ b/e107_handlers/notify_class.php @@ -400,8 +400,8 @@ class notify $template = "

{NEWS_TITLE}

{NEWS_SUMMARY}
-
by {NEWS_AUTHOR}
- +
".LAN_POSTED_BY.": {NEWS_AUTHOR}
+ "; $shortcodes = array( From dab6575618b01d5793e43766fb20d983cba855d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Mon, 13 Feb 2017 08:05:23 +0100 Subject: [PATCH 10/13] Update lan_eurl.php --- e107_languages/English/admin/lan_eurl.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/e107_languages/English/admin/lan_eurl.php b/e107_languages/English/admin/lan_eurl.php index 49d80e9cb..49daa02f4 100644 --- a/e107_languages/English/admin/lan_eurl.php +++ b/e107_languages/English/admin/lan_eurl.php @@ -131,4 +131,5 @@ define("LAN_EURL_SYSTEM_REWRITE_DESCR", "URLs for pages like Not Found, Access d define("LAN_EURL_CORE_INDEX", "Front Page"); define("LAN_EURL_CORE_INDEX_INFO", "Front Page can't have an alias."); define("LAN_EURL_REBUILD", "Rebuild"); -//define("LAN_EURL_", ""); \ No newline at end of file +define("LAN_EURL_REGULAR_EXPRESSION", "Regular Expression"); +define("LAN_EURL_KEY", "Key"); From 28cc819750de7ca94524618996df9b2e98bc5b8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Mon, 13 Feb 2017 08:06:44 +0100 Subject: [PATCH 11/13] Update lan_mailout.php --- e107_languages/English/admin/lan_mailout.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e107_languages/English/admin/lan_mailout.php b/e107_languages/English/admin/lan_mailout.php index 24e0cf655..6429d7ea7 100644 --- a/e107_languages/English/admin/lan_mailout.php +++ b/e107_languages/English/admin/lan_mailout.php @@ -289,6 +289,6 @@ define("LAN_MAILOUT_265", "Pending"); define("LAN_MAILOUT_266", "Max Active"); define("LAN_MAILOUT_267", "Generate Public/Private keys"); define("LAN_MAILOUT_268", "Developer Mode Only"); -//define("LAN_SUBMIT", "Do it!"); LAN_RUN +define("LAN_MAILOUT_269", "Send Later"); ?> From 10f53c6ffd6b1338b4aec3f3874bf98c89e87251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Mon, 13 Feb 2017 08:07:57 +0100 Subject: [PATCH 12/13] Update lan_newspost.php --- e107_languages/English/admin/lan_newspost.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/e107_languages/English/admin/lan_newspost.php b/e107_languages/English/admin/lan_newspost.php index 61df9c647..968a55181 100644 --- a/e107_languages/English/admin/lan_newspost.php +++ b/e107_languages/English/admin/lan_newspost.php @@ -234,5 +234,7 @@ define("LAN_NEWS_107", "Checking for Ping Status"); //v2.1.4 define("LAN_NEWS_108", "The SEF URL is unlike the title of your news item."); - -?> \ No newline at end of file +define("LAN_NEWS_109", "Trigger an email notification when you submit this form."); +define("LAN_NEWS_110", "News Cache Timeout"); +define("LAN_NEWS_111", "Time in minutes. Applies only when system cache is enabled."); +?> From b5da05a78c4733b0cabb7cefedb93e94c0038535 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Mon, 13 Feb 2017 08:18:33 +0100 Subject: [PATCH 13/13] Update mailout_admin_class.php --- e107_handlers/mailout_admin_class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/e107_handlers/mailout_admin_class.php b/e107_handlers/mailout_admin_class.php index 135268f57..4c34bce81 100644 --- a/e107_handlers/mailout_admin_class.php +++ b/e107_handlers/mailout_admin_class.php @@ -1604,10 +1604,10 @@ class mailoutAdminClass extends e107MailManager // Show the table of advanced options $text .= "
"; - $text .= "Send Now"; + $text .= "".LAN_MAILOUT_158.""; // $text .= $frm->admin_button('email_sendnow', "Send Now", 'primary'); - $text .= $frm->admin_button('email_send', "Send Later"); + $text .= $frm->admin_button('email_send', LAN_MAILOUT_269); // $text .= ""; @@ -2244,4 +2244,4 @@ class mailoutAdminClass extends e107MailManager } -?> \ No newline at end of file +?>