From 5febf55917065890cbe448ecb35e569da883753c Mon Sep 17 00:00:00 2001 From: Hristo Dipchikov Date: Wed, 14 Sep 2016 15:24:43 +0300 Subject: [PATCH 1/6] bg_BG update --- bl-languages/bg_BG.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bl-languages/bg_BG.json b/bl-languages/bg_BG.json index 9c6ddc54..38ea6322 100644 --- a/bl-languages/bg_BG.json +++ b/bl-languages/bg_BG.json @@ -42,7 +42,7 @@ "profile": "Профил", "email": "Имейл адрес", "settings": "Настройки", - "general": "Общи настройки:", + "general": "Общи настройки", "advanced": "Разширени настройки", "regional": "Регионални настройки", "about": "Относно", @@ -236,6 +236,11 @@ "social-networks-links": "Социални мрежи:", "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": "Искате ли да деактивирате този потребител?" } From bc0577a62e7f46162e50708a3f41c9b07fe7427f Mon Sep 17 00:00:00 2001 From: Hristo Dipchikov Date: Thu, 15 Sep 2016 11:41:02 +0300 Subject: [PATCH 2/6] Dashboard responsive update tranlation --- bl-kernel/admin/themes/default/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bl-kernel/admin/themes/default/index.php b/bl-kernel/admin/themes/default/index.php index 52792530..62eb7d80 100644 --- a/bl-kernel/admin/themes/default/index.php +++ b/bl-kernel/admin/themes/default/index.php @@ -108,7 +108,7 @@ $(document).ready(function() { p('New page') ?> -
  • Manage
    • +
  • p('Manage') ?>
  • > p('Posts') ?>
    • @@ -119,7 +119,7 @@ $(document).ready(function() { p('Users') ?> -
  • Settings
    • +
  • p('Settings') ?>
  • > p('General') ?>
    • From ffce70ce16660d6da3a32ac841f40b78544f736e Mon Sep 17 00:00:00 2001 From: Hristo Dipchikov Date: Thu, 15 Sep 2016 13:02:42 +0300 Subject: [PATCH 3/6] Dashboard responsive update tranlation --- bl-kernel/admin/views/edit-user.php | 6 +++--- bl-languages/bg_BG.json | 7 ++++++- bl-languages/en_US.json | 6 +++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/bl-kernel/admin/views/edit-user.php b/bl-kernel/admin/views/edit-user.php index e95135cd..a862da1c 100644 --- a/bl-kernel/admin/views/edit-user.php +++ b/bl-kernel/admin/views/edit-user.php @@ -118,8 +118,8 @@ if($Login->role()==='admin') { HTML::formInputText(array( 'name'=>'status', - 'label'=>$L->g('Current status'), - 'value'=>$_User->enabled()?$L->g('Enabled'):$L->g('Disabled'), + 'label'=>$L->g('сurrent-status'), + 'value'=>$_User->enabled()?$L->g('enabled-user-status'):$L->g('disable-user-status'), 'class'=>'uk-width-1-2 uk-form-medium', 'disabled'=>true, '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() ) { echo '
    - +
    '; } diff --git a/bl-languages/bg_BG.json b/bl-languages/bg_BG.json index 38ea6322..1dfb125f 100644 --- a/bl-languages/bg_BG.json +++ b/bl-languages/bg_BG.json @@ -241,6 +241,11 @@ "welcome": "Добре дошли!", "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": "Искате ли да деактивирате този потребител?", + "disable-user-status": "Неактивен", + "enabled-user-status": "Активен", + "сurrent-status" : "Статус", + "disable-the-user" : "Деактивиране на потребителя" + } diff --git a/bl-languages/en_US.json b/bl-languages/en_US.json index bb0292a2..1c91e6b9 100644 --- a/bl-languages/en_US.json +++ b/bl-languages/en_US.json @@ -243,5 +243,9 @@ "welcome": "Welcome", "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" } \ No newline at end of file From ebb941b98ee09e24262ba56c082ea8661071c474 Mon Sep 17 00:00:00 2001 From: Hristo Dipchikov Date: Sat, 17 Sep 2016 13:31:43 +0300 Subject: [PATCH 4/6] Bulgarian specialChars --- bl-kernel/helpers/text.class.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/bl-kernel/helpers/text.class.php b/bl-kernel/helpers/text.class.php index 2dcc8f4b..b97cb819 100644 --- a/bl-kernel/helpers/text.class.php +++ b/bl-kernel/helpers/text.class.php @@ -41,6 +41,15 @@ class Text { 'п'=>'p', 'р'=>'r', 'с'=>'s', 'т'=>'t', 'у'=>'u', 'ф'=>'f', 'х'=>'h', 'ц'=>'c', 'ч'=>'ch', 'ш'=>'sh', 'щ'=>'sh', 'ъ'=>'', 'ы'=>'y', 'ь'=>'', 'э'=>'e', 'ю'=>'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', + 'а'=>'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 'Є'=>'Ye', 'І'=>'I', 'Ї'=>'Yi', 'Ґ'=>'G', 'є'=>'ye', 'і'=>'i', 'ї'=>'yi', 'ґ'=>'g', From 6b00944d8b1f6de65464518d786f9b1970ec1e34 Mon Sep 17 00:00:00 2001 From: Hristo Dipchikov Date: Sat, 17 Sep 2016 13:33:42 +0300 Subject: [PATCH 5/6] fix --- bl-kernel/helpers/text.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/bl-kernel/helpers/text.class.php b/bl-kernel/helpers/text.class.php index b97cb819..d4132ac4 100644 --- a/bl-kernel/helpers/text.class.php +++ b/bl-kernel/helpers/text.class.php @@ -41,6 +41,7 @@ class Text { 'п'=>'p', 'р'=>'r', 'с'=>'s', 'т'=>'t', 'у'=>'u', 'ф'=>'f', 'х'=>'h', 'ц'=>'c', 'ч'=>'ch', 'ш'=>'sh', 'щ'=>'sh', 'ъ'=>'', 'ы'=>'y', 'ь'=>'', 'э'=>'e', 'ю'=>'yu', 'я'=>'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', From 01b7e743619edaa054cd45683de0a3180b40957b Mon Sep 17 00:00:00 2001 From: Hristo Dipchikov Date: Mon, 19 Sep 2016 10:43:06 +0300 Subject: [PATCH 6/6] Update --- bl-kernel/admin/views/add-user.php | 2 +- bl-kernel/admin/views/edit-user.php | 6 +++--- bl-languages/bg_BG.json | 6 ++---- bl-languages/en_US.json | 2 -- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/bl-kernel/admin/views/add-user.php b/bl-kernel/admin/views/add-user.php index bfd9b2ec..859c888a 100644 --- a/bl-kernel/admin/views/add-user.php +++ b/bl-kernel/admin/views/add-user.php @@ -57,4 +57,4 @@ HTML::formOpen(array('id'=>'add-user-form', 'class'=>'uk-form-horizontal')); '; -HTML::formClose(); +HTML::formClose(); \ No newline at end of file diff --git a/bl-kernel/admin/views/edit-user.php b/bl-kernel/admin/views/edit-user.php index a862da1c..243d1119 100644 --- a/bl-kernel/admin/views/edit-user.php +++ b/bl-kernel/admin/views/edit-user.php @@ -118,8 +118,8 @@ if($Login->role()==='admin') { HTML::formInputText(array( 'name'=>'status', - 'label'=>$L->g('сurrent-status'), - 'value'=>$_User->enabled()?$L->g('enabled-user-status'):$L->g('disable-user-status'), + 'label'=>$L->g('сurrent status'), + 'value'=>$_User->enabled()?$L->g('Enabled'):$L->g('Disabled'), 'class'=>'uk-width-1-2 uk-form-medium', 'disabled'=>true, '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() ) { echo '
    - +
    '; } diff --git a/bl-languages/bg_BG.json b/bl-languages/bg_BG.json index 1dfb125f..4d54c576 100644 --- a/bl-languages/bg_BG.json +++ b/bl-languages/bg_BG.json @@ -165,8 +165,8 @@ "publish": "Публикувай", "please-check-your-theme-configuration": "Моля, проверете конфигурацията на вашата тема.", "plugin-label": "Заглавие на компонент", - "enabled": "Разреши", - "disabled": "Забрани", + "enabled": "Активeн", + "disabled": "Неактивен", "cli-mode": "Режим CLI", "command-line-mode": "Режим на команден ред", "enable-the-command-line-mode-if-you-add-edit": "Смени с режим на командния ред, ако добавяте, променяте или изтривате постове и страници от файловата система", @@ -242,8 +242,6 @@ "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" : "Деактивиране на потребителя" diff --git a/bl-languages/en_US.json b/bl-languages/en_US.json index 1c91e6b9..4b70abc4 100644 --- a/bl-languages/en_US.json +++ b/bl-languages/en_US.json @@ -244,8 +244,6 @@ "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 ?", - "disable-user-status": "Disable", - "enabled-user-status": "Enabled", "сurrent-status" : "Status", "disable-the-user" : "Disable the user" } \ No newline at end of file