Merge 6b00944d8b1f6de65464518d786f9b1970ec1e34 into a06cf6bc86579928a1d79cc4fd116b4b75228c02

This commit is contained in:
Hristo Dipchikov 2016-09-17 16:08:01 +00:00 committed by GitHub
commit da3fd67499
5 changed files with 32 additions and 8 deletions

View File

@ -108,7 +108,7 @@ $(document).ready(function() {
<a href="<?php echo HTML_PATH_ADMIN_ROOT.'new-page' ?>"><?php $L->p('New page') ?></a> <a href="<?php echo HTML_PATH_ADMIN_ROOT.'new-page' ?>"><?php $L->p('New page') ?></a>
</li> </li>
<li class="uk-nav-header">Manage</li> <li class="uk-nav-header"><?php $L->p('Manage') ?></li>
<li <?php echo ($layout['view']=='manage-posts')?'class="uk-active"':'' ?>> <li <?php echo ($layout['view']=='manage-posts')?'class="uk-active"':'' ?>>
<a href="<?php echo HTML_PATH_ADMIN_ROOT.'manage-posts' ?>"><?php $L->p('Posts') ?></a> <a href="<?php echo HTML_PATH_ADMIN_ROOT.'manage-posts' ?>"><?php $L->p('Posts') ?></a>
</li> </li>
@ -119,7 +119,7 @@ $(document).ready(function() {
<a href="<?php echo HTML_PATH_ADMIN_ROOT.'users' ?>"><?php $L->p('Users') ?></a> <a href="<?php echo HTML_PATH_ADMIN_ROOT.'users' ?>"><?php $L->p('Users') ?></a>
</li> </li>
<li class="uk-nav-header">Settings</li> <li class="uk-nav-header"><?php $L->p('Settings') ?></li>
<li <?php echo ($layout['view']=='settings-general')?'class="uk-active"':'' ?>> <li <?php echo ($layout['view']=='settings-general')?'class="uk-active"':'' ?>>
<a href="<?php echo HTML_PATH_ADMIN_ROOT.'settings-general' ?>"><?php $L->p('General') ?></a> <a href="<?php echo HTML_PATH_ADMIN_ROOT.'settings-general' ?>"><?php $L->p('General') ?></a>
</li> </li>

View File

@ -118,8 +118,8 @@ if($Login->role()==='admin') {
HTML::formInputText(array( HTML::formInputText(array(
'name'=>'status', 'name'=>'status',
'label'=>$L->g('Current status'), 'label'=>$L->g('сurrent-status'),
'value'=>$_User->enabled()?$L->g('Enabled'):$L->g('Disabled'), 'value'=>$_User->enabled()?$L->g('enabled-user-status'):$L->g('disable-user-status'),
'class'=>'uk-width-1-2 uk-form-medium', 'class'=>'uk-width-1-2 uk-form-medium',
'disabled'=>true, 'disabled'=>true,
'tip'=>$_User->enabled()?'':$L->g('To enable the user you have to set a new password') 'tip'=>$_User->enabled()?'':$L->g('To enable the user you have to set a new password')
@ -128,7 +128,7 @@ if($Login->role()==='admin') {
if( $_User->enabled() ) { if( $_User->enabled() ) {
echo '<div class="uk-form-row"> echo '<div class="uk-form-row">
<div class="uk-form-controls"> <div class="uk-form-controls">
<button type="submit" id="jsdisable-user" class="delete-button" name="disable-user"><i class="uk-icon-ban"></i> '.$L->g('Disable the user').'</button> <button type="submit" id="jsdisable-user" class="delete-button" name="disable-user"><i class="uk-icon-ban"></i> '.$L->g('disable-the-user').'</button>
</div> </div>
</div>'; </div>';
} }

View File

@ -41,6 +41,16 @@ class Text {
'п'=>'p', 'р'=>'r', 'с'=>'s', 'т'=>'t', 'у'=>'u', 'ф'=>'f', 'х'=>'h', 'ц'=>'c', 'п'=>'p', 'р'=>'r', 'с'=>'s', 'т'=>'t', 'у'=>'u', 'ф'=>'f', 'х'=>'h', 'ц'=>'c',
'ч'=>'ch', 'ш'=>'sh', 'щ'=>'sh', 'ъ'=>'', 'ы'=>'y', 'ь'=>'', 'э'=>'e', 'ю'=>'yu', 'ч'=>'ch', 'ш'=>'sh', 'щ'=>'sh', 'ъ'=>'', 'ы'=>'y', 'ь'=>'', 'э'=>'e', 'ю'=>'yu',
'я'=>'ya', 'я'=>'ya',
// Bulgarian
'А'=>'A', 'Б'=>'B', 'В'=>'V', 'Г'=>'G', 'Д'=>'D', 'Е'=>'E', 'Ж'=>'Zh', 'З'=>'Z',
'И'=>'I', 'Й'=>'J', 'К'=>'K', 'Л'=>'L', 'М'=>'M', 'Н'=>'N', 'О'=>'O', 'П'=>'P',
'Р'=>'R', 'С'=>'S', 'Т'=>'T', 'У'=>'U', 'Ф'=>'F', 'Х'=>'H', 'Ц'=>'C', 'Ч'=>'Ch',
'Ш'=>'Sh', 'Щ'=>'Sh', 'Ъ'=>'', 'Ь'=>'J','Ю'=>'Yu','Я'=>'Ya',
'а'=>'a', 'б'=>'b', 'в'=>'v', 'г'=>'g', 'д'=>'d', 'е'=>'e', 'ж'=>'zh','з'=>'z',
'и'=>'i', 'й'=>'j', 'к'=>'k', 'л'=>'l', 'м'=>'m', 'н'=>'n', 'о'=>'o','п'=>'p',
'р'=>'r', 'с'=>'s', 'т'=>'t', 'у'=>'u', 'ф'=>'f', 'х'=>'h', 'ц'=>'c', 'ч'=>'ch',
'ш'=>'sh', 'щ'=>'sh', 'ъ'=>'', 'ь'=>'j', 'ю'=>'yu', 'я'=>'ya',
// Ukrainian // Ukrainian
'Є'=>'Ye', 'І'=>'I', 'Ї'=>'Yi', 'Ґ'=>'G', 'Є'=>'Ye', 'І'=>'I', 'Ї'=>'Yi', 'Ґ'=>'G',
'є'=>'ye', 'і'=>'i', 'ї'=>'yi', 'ґ'=>'g', 'є'=>'ye', 'і'=>'i', 'ї'=>'yi', 'ґ'=>'g',

View File

@ -42,7 +42,7 @@
"profile": "Профил", "profile": "Профил",
"email": "Имейл адрес", "email": "Имейл адрес",
"settings": "Настройки", "settings": "Настройки",
"general": "Общи настройки:", "general": "Общи настройки",
"advanced": "Разширени настройки", "advanced": "Разширени настройки",
"regional": "Регионални настройки", "regional": "Регионални настройки",
"about": "Относно", "about": "Относно",
@ -236,6 +236,16 @@
"social-networks-links": "Социални мрежи:", "social-networks-links": "Социални мрежи:",
"email-access-code": "Имейл код за достъп", "email-access-code": "Имейл код за достъп",
"current-format": "Текущ формат" "current-format": "Текущ формат",
"welcome": "Добре дошли!",
"to-enable-the-user-you-have-to-set-a-new-password": "За да се активира на ново потребителя трябва да му зададете нова парола .",
"do-you-want-to-disable-the-user": "Искате ли да деактивирате този потребител?",
"disable-user-status": "Неактивен",
"enabled-user-status": "Активен",
"сurrent-status" : "Статус",
"disable-the-user" : "Деактивиране на потребителя"
} }

View File

@ -243,5 +243,9 @@
"welcome": "Welcome", "welcome": "Welcome",
"to-enable-the-user-you-have-to-set-a-new-password": "To enable the user you have to set a new password.", "to-enable-the-user-you-have-to-set-a-new-password": "To enable the user you have to set a new password.",
"do-you-want-to-disable-the-user": "Do you want to disable the user ?" "do-you-want-to-disable-the-user": "Do you want to disable the user ?",
"disable-user-status": "Disable",
"enabled-user-status": "Enabled",
"сurrent-status" : "Status",
"disable-the-user" : "Disable the user"
} }