From 314c105508a7c12d53689ef567640c08bb2c5e9f Mon Sep 17 00:00:00 2001 From: Lucas Bickel Date: Thu, 23 Mar 2017 23:41:47 +0100 Subject: [PATCH] Proper translation rendering for main menu --- .../application/configs/navigation.php | 57 +++++++++++-------- .../application/views/scripts/menu.phtml | 46 +++++++-------- 2 files changed, 57 insertions(+), 46 deletions(-) diff --git a/airtime_mvc/application/configs/navigation.php b/airtime_mvc/application/configs/navigation.php index 502b6c758..b81ddee9f 100644 --- a/airtime_mvc/application/configs/navigation.php +++ b/airtime_mvc/application/configs/navigation.php @@ -1,40 +1,48 @@ ""._('My Podcast'), + 'label' => _('My Podcast'), 'module' => 'default', 'controller' => 'podcast', 'action' => 'station', - 'resource' => 'podcast' + 'resource' => 'podcast', + 'class' => '' ); $pages[] = array( - 'label' => ""._('Radio Page'), - 'uri' => '/', - 'resource' => '', - 'pages' => array( - ) + 'label' => _('Radio Page'), + 'uri' => '/', + 'resource' => '', + 'class' => '', + 'pages' => array() ); $pages[] = array( - 'label' => ""._('Calendar'), + 'label' => _('Calendar'), 'module' => 'default', 'controller' => 'schedule', 'action' => 'index', - 'resource' => 'schedule' + 'resource' => 'schedule', + 'class' => '' ); $pages[] = array( - 'label' => ""._('Widgets'), + 'label' => _('Widgets'), 'module' => 'default', 'controller' => 'embeddablewidgets', 'action' => 'player', 'resource' => 'embeddablewidgets', + 'class' => '', 'title' => 'Widgets', 'pages' => array( array( @@ -58,11 +66,12 @@ $pages[] = array( ) ); $pages[] = array( - 'label' => ""._("Settings"), + 'label' => _("Settings"), 'resource' => 'preference', 'action' => 'index', 'module' => 'default', 'controller' => 'preference', + 'class' => '', 'title' => 'Settings', 'pages' => array( array( @@ -99,11 +108,12 @@ $pages[] = array( ) ); $pages[] = array( - 'label' => ""._("Analytics"), + 'label' => _("Analytics"), 'module' => 'default', 'controller' => 'playouthistory', 'action' => 'index', 'resource' => 'playouthistory', + 'class' => '', 'title' => 'Analytics', 'pages' => array( array( @@ -162,11 +172,12 @@ if (LIBRETIME_ENABLE_BILLING === true) { ); } $pages[] = array( - 'label' => ""._('Help'), + 'label' => _('Help'), 'controller' => 'dashboard', 'action' => 'help', - 'resource' => 'dashboard', - 'title' => 'Help', + 'resource' => 'dashboard', + 'class' => '', + 'title' => 'Help', 'pages' => array( array( 'label' => _('Getting Started'), diff --git a/airtime_mvc/application/views/scripts/menu.phtml b/airtime_mvc/application/views/scripts/menu.phtml index 1cd0d7e04..2fcd2c67c 100644 --- a/airtime_mvc/application/views/scripts/menu.phtml +++ b/airtime_mvc/application/views/scripts/menu.phtml @@ -1,32 +1,32 @@