From 0cf8735cacb36a9d19ca303062f6562daeb03696 Mon Sep 17 00:00:00 2001 From: MikeyGMT Date: Sat, 27 Aug 2016 12:03:23 +0100 Subject: [PATCH 1/4] #6 Info Panel Text to LANS #6 Info Panel Text to LANS --- e107_admin/includes/infopanel.php | 38 ++++++++++------------ e107_languages/English/admin/lan_admin.php | 14 +++++++- 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/e107_admin/includes/infopanel.php b/e107_admin/includes/infopanel.php index ca562d228..94f42b51e 100644 --- a/e107_admin/includes/infopanel.php +++ b/e107_admin/includes/infopanel.php @@ -209,11 +209,11 @@ class adminstyle_infopanel // ------------------------------- e107 News -------------------------------- $newsTabs = array(); - $newsTabs['coreFeed'] = array('caption'=>'General','text'=>"
".LAN_MORE."
"); - $newsTabs['pluginFeed'] = array('caption'=>'Plugins','text'=>"
"); - $newsTabs['themeFeed'] = array('caption'=>'Themes','text'=>"
"); + $newsTabs['coreFeed'] = array('caption'=>LAN_GENERAL,'text'=>"
".LAN_MORE."
"); + $newsTabs['pluginFeed'] = array('caption'=>LAN_PLUGIN,'text'=>"
"); + $newsTabs['themeFeed'] = array('caption'=>LAN_THEMES,'text'=>"
"); - $text2 = $ns->tablerender("Latest e107 News",e107::getForm()->tabs($newsTabs, array('active'=>'coreFeed')),"core-infopanel_news",true); + $text2 = $ns->tablerender(LAN_LATEST_e107_NEWS,e107::getForm()->tabs($newsTabs, array('active'=>'coreFeed')),"core-infopanel_news",true); @@ -226,7 +226,7 @@ class adminstyle_infopanel - $text2 .= $ns->tablerender("Website Status", $this->renderWebsiteStatus(),"",true); + $text2 .= $ns->tablerender(LAN_WEBSITE_STATUS, $this->renderWebsiteStatus(),"",true); // $text .= $ns->tablerender(ADLAN_LAT_1,$tp->parseTemplate("{ADMIN_LATEST=norender}"),"core-infopanel_latest",true); @@ -352,8 +352,8 @@ class adminstyle_infopanel */ $tab = array(); - $tab['e-stats'] = array('caption'=>$tp->toGlyph('fa-signal').' Stats', 'text'=>$this->renderChart()); - $tab['e-online'] = array('caption'=>$tp->toGlyph('fa-user').' Online ('.$this->renderOnlineUsers('count').')', 'text'=>$this->renderOnlineUsers()); + $tab['e-stats'] = array('caption'=>$tp->toGlyph('fa-signal').' '.LAN_STATS, 'text'=>$this->renderChart()); + $tab['e-online'] = array('caption'=>$tp->toGlyph('fa-user').' '.LAN_ONLINE.' ('.$this->renderOnlineUsers('count').')', 'text'=>$this->renderOnlineUsers()); @@ -401,19 +401,18 @@ class adminstyle_infopanel $panelOnline .= (!empty($multilan)) ? "" : ""; - // TODO LAN $panelOnline .= " - Timestamp - Username - IP - Page - Agent"; + ".LAN_TIMESTAMP." + ".LAN_USER." + ".LAN_IP." + ".LAN_PAGE." + ".LAN_AGENT.""; - $panelOnline .= (!empty($multilan)) ? "Lang." : ""; + $panelOnline .= (!empty($multilan)) ? "".LAN_LANG."" : ""; $panelOnline .= " @@ -531,15 +530,14 @@ class adminstyle_infopanel
  • {USER_AVATAR=".$row['comment_author_id']."}
    - - + +
    -
    Posted by {USERNAME} {TIMEDATE=relative}
    +
    + ".LAN_POSTED_BY_X."

    {COMMENT}

    • "; - - //TODO LAN for 'Posted by [x] '; $sc->setVars($row); $text .= $tp->parseTemplate($TEMPLATE,true,$sc); @@ -550,7 +548,7 @@ class adminstyle_infopanel $text .= '
    - View all + '.LAN_VIEW_ALL.'
    '; // $text .= "Note: Not fully functional at the moment."; diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php index edfdb8b10..9c0b9f3fa 100644 --- a/e107_languages/English/admin/lan_admin.php +++ b/e107_languages/English/admin/lan_admin.php @@ -263,9 +263,13 @@ define("LAN_TIME","Time"); define("LAN_EMPTY","There are no entries in the database yet"); define("LAN_EXISTING","Existing Entries"); - define("LAN_CONFDELETE","Confirm Delete"); define("LAN_PLUGIN","Plugin"); +define("LAN_THEMES","Themes"); +define("LAN_LATEST_e107_NEWS","Latest e107 News"); +define("LAN_WEBSITE_STATUS","Website Status"); +define("LAN_STATS","Stats"); +define("LAN_ONLINE","Online"); define("LAN_ORDER","Order"); define("LAN_SELECT","Select ..."); @@ -273,12 +277,20 @@ define("LAN_ADMIN","Admin"); define("LAN_DISPLAYOPT", "Edit Display Options"); // define("LAN_GOPAGE", "Go to page:"); define("LAN_DATESTAMP","Date stamp"); +define("LAN_TIMESTAMP","Timestamp"); +define("LAN_IP","IP"); +define("LAN_PAGE","PAGE"); +define("LAN_AGENT","AGENT"); +define("LAN_LANG","Lang."); +define("LAN_APPROVE","Approve"); define("LAN_OPTIONAL", "optional"); define("LAN_INACTIVE","Inactive"); define("LAN_ACTIVE","Active"); define("LAN_ACCEPT","Accept"); define("LAN_PENDING","Pending"); define("LAN_SUBMITTED","Submitted"); +define("LAN_POSTED_BY_X","Posted by {USERNAME} {TIMEDATE=relative}"); +define("LAN_VIEW_ALL","View All"); define("LAN_BAN","Ban"); From 3dc77ca7bfaae63069250337007b3f01b5b3cebb Mon Sep 17 00:00:00 2001 From: MikeyGMT Date: Sun, 28 Aug 2016 12:49:37 +0100 Subject: [PATCH 2/4] #6 Some Admin User Lans #6 Some Admin User Lans --- e107_admin/users.php | 10 +++++----- e107_languages/English/admin/lan_admin.php | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/e107_admin/users.php b/e107_admin/users.php index 20ef3e667..5962ea6f9 100644 --- a/e107_admin/users.php +++ b/e107_admin/users.php @@ -533,11 +533,11 @@ class users_admin_ui extends e_admin_ui $update['data']['user_extended_id'] = intval($new_data['submit_value']); if(e107::getDb()->insert('user_extended', $update)) { - e107::getMessage()->addSuccess('Extended Fields Updated'); //TODO Replace with Generic or existing LAN. + e107::getMessage()->addSuccess(LAN_UPDATED); } else { - e107::getMessage()->addError('Extended Fields Insert Failed'); //TODO Replace with Generic or existing LAN. + e107::getMessage()->addError(LAN_UPDATED_FAILED); $error = e107::getDb()->getLastErrorText(); e107::getMessage()->addDebug($error); e107::getMessage()->addDebug(print_a($update,true)); @@ -552,7 +552,7 @@ class users_admin_ui extends e_admin_ui if(e107::getDb()->update('user_extended',$update)===false) { - e107::getMessage()->addError('Extended Fields Update Failed'); //TODO Replace with Generic or existing LAN. + e107::getMessage()->addError(LAN_UPDATED_FAILED); $error = e107::getDb()->getLastErrorText(); e107::getMessage()->addDebug($error); e107::getMessage()->addDebug(print_a($update,true)); @@ -780,8 +780,8 @@ class users_admin_ui extends e_admin_ui $this->redirect('list', 'main', true); } - // TODO - lan - if(!$sysuser->getId()) e107::getMessage()->addError('User not found.'); + + if(!$sysuser->getId()) e107::getMessage()->addError(LAN_USER_NOT_FOUND); } public function LogoutasPage() diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php index 9c0b9f3fa..6b7d0a454 100644 --- a/e107_languages/English/admin/lan_admin.php +++ b/e107_languages/English/admin/lan_admin.php @@ -420,6 +420,7 @@ define("LAN_UI_TOTAL_RECORDS", "Total Records: [x]"); define("LAN_USER_MANAGEALL", "Manage all User, Userclass and Extended User-Field settings"); define("LAN_USER_LIST", "User List"); define("LAN_USER_QUICKADD","Quick Add User"); +define("LAN_USER_NOT_FOUND","User Not Found."); define("LAN_USER_PRUNE", "Prune Users"); define("LAN_USER_OPTIONS", "User Options"); define("LAN_USER_RANKS", "User Ranks"); From 3b9869e4554a277c5973d961f8b01f6fdf4f33c0 Mon Sep 17 00:00:00 2001 From: MikeyGMT Date: Mon, 29 Aug 2016 11:59:22 +0100 Subject: [PATCH 3/4] Further update on User.php - added entity to addError failures Further update on User.php - added entity to addError failures --- e107_admin/users.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/e107_admin/users.php b/e107_admin/users.php index 5962ea6f9..81b9328d2 100644 --- a/e107_admin/users.php +++ b/e107_admin/users.php @@ -533,11 +533,11 @@ class users_admin_ui extends e_admin_ui $update['data']['user_extended_id'] = intval($new_data['submit_value']); if(e107::getDb()->insert('user_extended', $update)) { - e107::getMessage()->addSuccess(LAN_UPDATED); + e107::getMessage()->addSuccess(LAN_UPDATED.': '.ADLAN_78); } else { - e107::getMessage()->addError(LAN_UPDATED_FAILED); + e107::getMessage()->addError(LAN_UPDATED_FAILED.': '.ADLAN_78); $error = e107::getDb()->getLastErrorText(); e107::getMessage()->addDebug($error); e107::getMessage()->addDebug(print_a($update,true)); @@ -552,7 +552,7 @@ class users_admin_ui extends e_admin_ui if(e107::getDb()->update('user_extended',$update)===false) { - e107::getMessage()->addError(LAN_UPDATED_FAILED); + e107::getMessage()->addError(LAN_UPDATED_FAILED.': '.ADLAN_78); $error = e107::getDb()->getLastErrorText(); e107::getMessage()->addDebug($error); e107::getMessage()->addDebug(print_a($update,true)); @@ -560,7 +560,7 @@ class users_admin_ui extends e_admin_ui } else { - // e107::getMessage()->addSuccess('Extended Fields Updated'); //TODO Replace with Generic or existing LAN. + e107::getMessage()->addSuccess(LAN_UPDATED.': '.ADLAN_78); } } } From 877fee9699efb9207eafe214fb269b3620d02fdf Mon Sep 17 00:00:00 2001 From: MikeyGMT Date: Tue, 30 Aug 2016 00:57:35 +0100 Subject: [PATCH 4/4] Removed success messages as done automatically. See pull/1816 comments: removed or rather replaced success messaged to debugs instead. We only need to give detail when failing. --- e107_admin/users.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/e107_admin/users.php b/e107_admin/users.php index 81b9328d2..b35190b29 100644 --- a/e107_admin/users.php +++ b/e107_admin/users.php @@ -533,7 +533,8 @@ class users_admin_ui extends e_admin_ui $update['data']['user_extended_id'] = intval($new_data['submit_value']); if(e107::getDb()->insert('user_extended', $update)) { - e107::getMessage()->addSuccess(LAN_UPDATED.': '.ADLAN_78); + // e107::getMessage()->addSuccess(LAN_UPDATED.': '.ADLAN_78); // not needed see pull/1816 + e107::getMessage()->addDebug(LAN_UPDATED.': '.ADLAN_78); // let's put it in debug instead } else { @@ -560,7 +561,8 @@ class users_admin_ui extends e_admin_ui } else { - e107::getMessage()->addSuccess(LAN_UPDATED.': '.ADLAN_78); + // e107::getMessage()->addSuccess(LAN_UPDATED.': '.ADLAN_78); // not needed pull/1816 + e107::getMessage()->addDebug(LAN_UPDATED.': '.ADLAN_78); // let's put it in debug instead } } } @@ -1717,7 +1719,7 @@ class users_admin_ui extends e_admin_ui e107::getDb()->insert('generic', $tmp); } - e107::getMessage()->addSuccess(LAN_UPDATED); + e107::getMessage()->addSuccess(LAN_UPDATED); //XXX maybe not needed see pull/1816 e107::getCache()->clear_sys('nomd5_user_ranks'); }