Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #118 from radiorabe/feature/pull-ru-from-zanata 

Update ru and de i18n
This commit is contained in:
Robb 2017-03-24 10:57:48 -04:00 committed by GitHub
parent ba00548048 01e7b31ccb
commit 3196603dde
13 changed files with 1669 additions and 1093 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/common/Timezone.php
View File

@ -18,7 +18,7 @@ class Application_Common_Timezone
'UTC' => DateTimeZone::UTC
);
$tzlist = array(NULL => "Use station default");
$tzlist = array(NULL => _("Use station default"));
foreach ($regions as $name => $mask) {
$ids = DateTimeZone::listIdentifiers($mask);

57
airtime_mvc/application/configs/navigation.php
View File

@ -1,40 +1,48 @@
<?php
/*
* Navigation container (config/array)
* Each element in the array will be passed to
* Zend_Navigation_Page::factory() when constructing
* the navigation container below.
*/
/**
* Navigation container (config/array)
*
* Each element in the array will be passed to
* Zend_Navigation_Page::factory() when constructing
* the navigation container below.
*
* The class field is used to contain the icon rendered
* before the nav entry for i18n purposes. When this
* gets parsed the language is not yet set and the
* strings stay plain en for now. They get retranslated
* in the menu.phtml script when they are output.
*/
$pages = array();
$pages[] = array(
'label' => "<i class='icon-music icon-white'></i>"._('My Podcast'),
'label' => _('My Podcast'),
'module' => 'default',
'controller' => 'podcast',
'action' => 'station',
'resource' => 'podcast'
'resource' => 'podcast',
'class' => '<i class="icon-music icon-white"></i>'
);
$pages[] = array(
'label' => "<i class='icon-globe icon-white'></i>"._('Radio Page'),
'uri' => '/',
'resource' => '',
'pages' => array(
)
'label' => _('Radio Page'),
'uri' => '/',
'resource' => '',
'class' => '<i class="icon-globe icon-white"></i>',
'pages' => array()
);
$pages[] = array(
'label' => "<i class='icon-calendar icon-white'></i>"._('Calendar'),
'label' => _('Calendar'),
'module' => 'default',
'controller' => 'schedule',
'action' => 'index',
'resource' => 'schedule'
'resource' => 'schedule',
'class' => '<i class="icon-calendar icon-white"></i>'
);
$pages[] = array(
'label' => "<i class='icon-wrench icon-white'></i>"._('Widgets'),
'label' => _('Widgets'),
'module' => 'default',
'controller' => 'embeddablewidgets',
'action' => 'player',
'resource' => 'embeddablewidgets',
'class' => '<i class="icon-wrench icon-white"></i>',
'title' => 'Widgets',
'pages' => array(
array(
@ -58,11 +66,12 @@ $pages[] = array(
)
);
$pages[] = array(
'label' => "<i class='icon-cog icon-white'></i>"._("Settings"),
'label' => _("Settings"),
'resource' => 'preference',
'action' => 'index',
'module' => 'default',
'controller' => 'preference',
'class' => '<i class="icon-cog icon-white"></i>',
'title' => 'Settings',
'pages' => array(
array(
@ -99,11 +108,12 @@ $pages[] = array(
)
);
$pages[] = array(
'label' => "<i class='icon-signal icon-white'></i>"._("Analytics"),
'label' => _("Analytics"),
'module' => 'default',
'controller' => 'playouthistory',
'action' => 'index',
'resource' => 'playouthistory',
'class' => '<i class="icon-signal icon-white"></i>',
'title' => 'Analytics',
'pages' => array(
array(
@ -162,11 +172,12 @@ if (LIBRETIME_ENABLE_BILLING === true) {
);
}
$pages[] = array(
'label' => "<i class='icon-question-sign icon-white'></i>"._('Help'),
'label' => _('Help'),
'controller' => 'dashboard',
'action' => 'help',
'resource' => 'dashboard',
'title' => 'Help',
'resource' => 'dashboard',
'class' => '<i class="icon-question-sign icon-white"></i>',
'title' => 'Help',
'pages' => array(
array(
'label' => _('Getting Started'),

11
airtime_mvc/application/controllers/LocaleController.php
View File

@ -1,12 +1,7 @@
<?php
class LocaleController extends Zend_Controller_Action
final class LocaleController extends Zend_Controller_Action
{
public function init()
{
}
public function datatablesTranslationTableAction()
{
$this->view->layout()->disableLayout();
@ -285,6 +280,7 @@ class LocaleController extends Zend_Controller_Action
"Filtering out " => _("Filtering out "),
" of " => _(" of "),
" records" => _(" records"),
"There are no shows scheduled during the specified time period." => _("There are no shows scheduled during the specified time period."),
//already in library/library.js
//"Title" => _("Title"),
//"Creator" => _("Creator"),
@ -443,7 +439,6 @@ class LocaleController extends Zend_Controller_Action
$this->view->layout()->disableLayout();
$this->_helper->viewRenderer->setNoRender(true);
header("Content-type: text/javascript");
echo "var general_dict=".json_encode($translations);
echo "var general_dict=".$this->_helper->json->encodeJson($translations);
}
}

1
airtime_mvc/application/controllers/plugins/PageLayoutInitPlugin.php
View File

@ -32,7 +32,6 @@ class PageLayoutInitPlugin extends Zend_Controller_Plugin_Abstract
"api",
"auth",
"error",
"locale",
"upgrade",
'whmcs-login',
"provisioning",

4
airtime_mvc/application/layouts/scripts/layout.phtml
View File

@ -126,11 +126,11 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
<?php if (isset($this->layout()->parent_page)) { ?>
<div id="sub-menu">
<h3><?php //parent_page is passed in from controller
echo $this->layout()->parent_page; ?></h3>
echo _($this->layout()->parent_page); ?></h3>
<hr>
<?php
$page = $this->navigation()->findOneBy('title', $this->layout()->parent_page);
echo $this->navigation()->menu()->renderMenu($page);
echo $this->navigation()->menu()->render($page);
?>
</div>
<?php } ?>

2
airtime_mvc/application/models/Locale.php
View File

@ -1,6 +1,6 @@
<?php
class Application_Model_Locale
final class Application_Model_Locale
{
private static $domains = array(
'airtime',

48
airtime_mvc/application/views/scripts/menu.phtml
View File

@ -1,32 +1,32 @@
<ol id="navlist">
<ol class="navigation">
<?php foreach ($this->container as $page) : ?>
<?php if($this->navigation()->accept($page)) : ?>
<li class="top <?php if($page->isActive(true)){echo 'active';} ?>">
<?php if($page->hasPages()) : ?>
<a class="top_link" href="<?php echo $page->getHref(); ?>">
<span class="down"><?php echo _($page->getLabel()); ?></span>
</a>
<ul class="sub">
<li class="top <?php if($page->isActive(true)){echo 'active';} ?>">
<?php if($page->hasPages()) : ?>
<a class="top_link" href="<?php echo $page->getHref(); ?>">
<span class="down"><?php echo $page->getClass(); echo _($page->getLabel()); ?></span>
</a>
<ul class="sub">
<?php foreach ($page->getPages() as $sub) :
if($sub->getId() == "manage_folder"){
continue;
} ?>
<?php foreach ($page->getPages() as $sub) :
if($sub->getId() == "manage_folder"){
continue;
} ?>
<?php if($this->navigation()->accept($sub)) : ?>
<?php if($this->navigation()->accept($sub)) : ?>
<li>
<a href="<?php echo $sub->getHref(); ?>" <?php echo ($sub->getTarget() != "")?"target=\"".$sub->getTarget()."\"":""; ?>><?php echo _($sub->getLabel()); ?></a>
</li>
<?php endif; ?>
<?php endforeach; ?>
</ul>
<?php else: ?>
<a class="top_link" href="<?php echo $page->getHref(); ?>">
<span><?php echo _($page->getLabel()); ?></span>
</a>
<?php endif; ?>
</li>
<li>
<a href="<?php echo $sub->getHref(); ?>" <?php echo ($sub->getTarget() != "")?"target=\"".$sub->getTarget()."\"":""; ?>><?php echo $page->getClass(); echo _($sub->getLabel()); ?></a>
</li>
<?php endif; ?>
<?php endforeach; ?>
</ul>
<?php else: ?>
<a class="top_link" href="<?php echo $page->getHref(); ?>">
<span><?php echo $page->getClass(); echo _($page->getLabel()); ?></span>
</a>
<?php endif; ?>
</li>
<?php endif; ?>
<?php endforeach; ?>
</ol>

BIN
airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.mo
View File

Binary file not shown.

916
airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
View File

File diff suppressed because it is too large Load Diff

BIN
airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.mo
View File

Binary file not shown.

1716
airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po
View File

File diff suppressed because it is too large Load Diff

2
airtime_mvc/public/css/masterpanel.css
View File

@ -303,7 +303,7 @@
.personal-block.solo {
width: 200px;
width: 215px;
line-height: 32px;
margin: 0;
}

3
airtime_mvc/public/css/styles.css
View File

@ -401,7 +401,7 @@ select {
/*top: 0;*/
/*right: 0;*/
}
#navlist {
ol.navigation {
padding: 0;
margin: 0;
}
@ -3810,6 +3810,7 @@ button.btn-icon-text > i.icon-white {
top: 102px;
bottom: 0; /* Account for scrollbars */
min-width: 150px;
max-width: 160px;
border-right: 1px solid #5b5b5b;
background: #242424;
font-size: 14px;