From 838aa4d96bc49463480329b56e9b27e015b51a85 Mon Sep 17 00:00:00 2001 From: arlen Date: Thu, 16 Sep 2021 22:47:35 -0400 Subject: [PATCH] Update localization strings and ensure breadcrumbs and the hamburger menu appear only when they should (CO-2141) --- app/src/Locale/en_US/default.po | 35 ++++++++++++-------------- app/src/Template/Element/menuMain.ctp | 6 ++--- app/src/Template/Element/menuTop.ctp | 4 +-- app/src/Template/Layout/default.ctp | 18 +++++++------ app/src/Template/Matchgrids/manage.ctp | 6 ++--- app/webroot/css/co-base.css | 2 +- 6 files changed, 35 insertions(+), 36 deletions(-) diff --git a/app/src/Locale/en_US/default.po b/app/src/Locale/en_US/default.po index e65ac1886..e379014d8 100644 --- a/app/src/Locale/en_US/default.po +++ b/app/src/Locale/en_US/default.po @@ -478,12 +478,6 @@ msgid "match.home.welcome" msgstr "Welcome to {0}." ### Informational Messages -msgid "match.in.matchgrid" -msgstr "Matchgrid" - -msgid "match.in.matchgrid.config" -msgstr "Matchgrid Configuration" - msgid "match.in.matchgrid.display" msgstr "Display all records associated with this Matchgrid." @@ -499,19 +493,6 @@ msgstr "There are no matchgrids currently defined." msgid "match.in.pagination.format" msgstr "Page {{page}} of {{pages}}, Viewing {{start}}-{{end}} of {{count}}" -### Menu Items -msgid "match.me.display" -msgstr "Display" - -msgid "match.me.manage" -msgstr "Manage" - -msgid "match.me.platform" -msgstr "Platform" - -msgid "match.me.reconcile" -msgstr "Reconcile" - ### Operations (Commands) msgid "match.op.add.a" msgstr "Add New {0}" @@ -538,6 +519,9 @@ msgid "match.op.delete.confirm" msgstr "Are you sure you wish to delete this record ({0})?" msgid "match.op.display" +msgstr "Display" + +msgid "match.op.display.records" msgstr "Display Records" msgid "match.op.duplicate" @@ -582,10 +566,16 @@ msgstr "Display" msgid "match.op.page.goto" msgstr "Go To Page" +msgid "match.op.platform" +msgstr "Platform" + msgid "match.op.previous" msgstr "Previous" msgid "match.op.reconcile" +msgstr "Reconcile" + +msgid "match.op.reconcile.requests" msgstr "Reconcile Requests" msgid "match.op.reconcile.a" @@ -642,3 +632,10 @@ msgstr "Request could not be canonically resolved, pending record {0} created" msgid "match.rs.saved" msgstr "Saved" + +### Titles +msgid "match.ti.matchgrid.config" +msgstr "Matchgrid Configuration" + +msgid "match.ti.matchgrid" +msgstr "Matchgrid: {0}" \ No newline at end of file diff --git a/app/src/Template/Element/menuMain.ctp b/app/src/Template/Element/menuMain.ctp index d11f8a361..2eb32feb0 100644 --- a/app/src/Template/Element/menuMain.ctp +++ b/app/src/Template/Element/menuMain.ctp @@ -35,7 +35,7 @@
  • Html->link( ' - ' . __('match.me.manage') . '', + ' . __('match.op.manage') . '', ['controller' => 'Matchgrids', 'action' => 'manage', $vv_cur_mg->id], @@ -46,7 +46,7 @@
  • Html->link( ' - ' . __('match.me.display') . '', + ' . __('match.op.display') . '', ['controller' => 'MatchgridRecords', 'action' => 'index', 'matchgrid_id' => $vv_cur_mg->id], @@ -58,7 +58,7 @@
  • Html->link( ' - ' . __('match.me.reconcile') . '', + ' . __('match.op.reconcile') . '', ['controller' => 'Matchgrids', 'action' => 'pending', $vv_cur_mg->id], diff --git a/app/src/Template/Element/menuTop.ctp b/app/src/Template/Element/menuTop.ctp index 0c9979eee..c292b0813 100644 --- a/app/src/Template/Element/menuTop.ctp +++ b/app/src/Template/Element/menuTop.ctp @@ -31,8 +31,8 @@
  • diff --git a/app/src/Template/Layout/default.ctp b/app/src/Template/Layout/default.ctp index dd13dfcd0..d318e8d33 100644 --- a/app/src/Template/Layout/default.ctp +++ b/app/src/Template/Layout/default.ctp @@ -71,8 +71,8 @@ if(isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'M request->getParam('controller')); - $action_stripped = preg_replace('/[^a-zA-Z0-9\-_]/', '', $this->request->getParam('action')); + $controller_stripped = preg_replace('/[^a-zA-Z0-9\-_]/', '', strtolower($this->request->getParam('controller'))); + $action_stripped = preg_replace('/[^a-zA-Z0-9\-_]/', '', strtolower($this->request->getParam('action'))); $bodyClasses = $controller_stripped . ' ' .$action_stripped; // add further body classes as needed @@ -90,7 +90,7 @@ if(isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'M
    - +
    menu