From d3e99988c464aa04f5ff448b77b42b91b567809a Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sun, 10 Jul 2016 14:50:31 +0600 Subject: [PATCH] Localization fixes --- public/assets/js/build-plugins/loc.js | 2 +- public/assets/js/build-plugins/summary.js | 6 ++-- public/assets/js/build-plugins/warnings.js | 2 +- src/PHPCI/Languages/lang.en.php | 25 ++++++------- src/PHPCI/Languages/lang.ru.php | 41 +++++++++++----------- 5 files changed, 39 insertions(+), 37 deletions(-) diff --git a/public/assets/js/build-plugins/loc.js b/public/assets/js/build-plugins/loc.js index c08a58c0..4962122a 100644 --- a/public/assets/js/build-plugins/loc.js +++ b/public/assets/js/build-plugins/loc.js @@ -76,7 +76,7 @@ var locPlugin = ActiveBuild.UiPlugin.extend({ }; for (var i in builds) { - self.chartData.labels.push('Build ' + builds[i].build_id); + self.chartData.labels.push(Lang.get('build') + ' ' + builds[i].build_id); self.chartData.datasets[0].data.push(builds[i].meta_value.LOC); self.chartData.datasets[1].data.push(builds[i].meta_value.LLOC); self.chartData.datasets[2].data.push(builds[i].meta_value.CLOC); diff --git a/public/assets/js/build-plugins/summary.js b/public/assets/js/build-plugins/summary.js index 7ccea67b..d14951a0 100644 --- a/public/assets/js/build-plugins/summary.js +++ b/public/assets/js/build-plugins/summary.js @@ -27,7 +27,7 @@ var SummaryPlugin = ActiveBuild.UiPlugin.extend({ ''+Lang.get('stage')+'' + ''+Lang.get('plugin')+'' + ''+Lang.get('status')+'' + - ''+Lang.get('duration')+' (s)' + + '' + Lang.get('duration') + ' (' + Lang.get('seconds') + ')' + '' ); }, @@ -48,8 +48,8 @@ var SummaryPlugin = ActiveBuild.UiPlugin.extend({ duration = data.started ? ((data.ended || Math.floor(Date.now()/1000)) - data.started) : '-'; tbody.append( '' + - '' + Lang.get('stage_'+stage) + '' + - '' + plugin + '' + + '' + Lang.get('stage_' + stage) + '' + + '' + Lang.get(plugin) + '' + '' + ' ' + this.statusLabels[data.status] + diff --git a/public/assets/js/build-plugins/warnings.js b/public/assets/js/build-plugins/warnings.js index 6e50e945..93152dca 100644 --- a/public/assets/js/build-plugins/warnings.js +++ b/public/assets/js/build-plugins/warnings.js @@ -102,7 +102,7 @@ var warningsPlugin = ActiveBuild.UiPlugin.extend({ } for (var build in self.data) { - self.chartData.labels.push('Build ' + build); + self.chartData.labels.push(Lang.get('build') + ' ' + build); var i = 0; for (var key in self.keys) { diff --git a/src/PHPCI/Languages/lang.en.php b/src/PHPCI/Languages/lang.en.php index 2867b746..bd0b292b 100644 --- a/src/PHPCI/Languages/lang.en.php +++ b/src/PHPCI/Languages/lang.en.php @@ -168,8 +168,8 @@ PHPCI', 'information' => 'Information', 'build_x_not_found' => 'Build with ID %d does not exist.', - 'build_n' => 'Build %d', - 'rebuild_now' => 'Rebuild Now', + 'build_n' => 'Build %d', + 'rebuild_now' => 'Rebuild Now', 'committed_by_x' => 'Committed by %s', @@ -308,17 +308,18 @@ PHPCI', 'search' => 'Search »', // Summary plugin - 'build-summary' => 'Summary', - 'stage' => 'Stage', - 'duration' => 'Duration', - 'plugin' => 'Plugin', - 'stage_setup' => 'Setup', - 'stage_test' => 'Test', + 'build-summary' => 'Summary', + 'stage' => 'Stage', + 'duration' => 'Duration', + 'seconds' => 'sec.', + 'plugin' => 'Plugin', + 'stage_setup' => 'Setup', + 'stage_test' => 'Test', 'stage_complete' => 'Complete', - 'stage_success' => 'Success', - 'stage_failure' => 'Failure', - 'stage_broken' => 'Broken', - 'stage_fixed' => 'Fixed', + 'stage_success' => 'Success', + 'stage_failure' => 'Failure', + 'stage_broken' => 'Broken', + 'stage_fixed' => 'Fixed', 'build_details' => 'Build Details', 'commit_details' => 'Commit Details', diff --git a/src/PHPCI/Languages/lang.ru.php b/src/PHPCI/Languages/lang.ru.php index 9d960f99..d798f9b7 100644 --- a/src/PHPCI/Languages/lang.ru.php +++ b/src/PHPCI/Languages/lang.ru.php @@ -82,9 +82,9 @@ PHPCI', 'latest_builds' => 'Последние сборки', 'pending' => 'Ожидает', 'running' => 'Запущена', - 'success' => 'Успешно', - 'successful' => 'Успешна', - 'failed' => 'Провалена', + 'success' => 'Успех', + 'successful' => 'Успешно', + 'failed' => 'Провал', 'manual_build' => 'Запущена вручную', // Add/Edit Project: @@ -158,11 +158,11 @@ PHPCI', 'group_save' => 'Сохранить группу', // View Build - 'errors' => 'Ошибки', - 'information' => 'Информация', + 'errors' => 'Ошибки', + 'information' => 'Информация', 'build_x_not_found' => 'Сборки с ID %d не существует.', - 'build_n' => 'Сборка %d', - 'rebuild_now' => 'Пересобрать сейчас', + 'build_n' => 'Сборка %d', + 'rebuild_now' => 'Пересобрать сейчас', 'committed_by_x' => 'Отправил %s', 'commit_id_x' => 'Коммит: %s', @@ -297,17 +297,18 @@ PHPCI', 'search' => 'Искать »', // Summary plugin - 'build-summary' => 'Сводка', - 'stage' => 'Этап', - 'duration' => 'Продолжительность', - 'plugin' => 'Плагин', - 'stage_setup' => 'Установка', - 'stage_test' => 'тестирование', + 'build-summary' => 'Сводка', + 'stage' => 'Этап', + 'duration' => 'Продолжительность', + 'seconds' => 'сек.', + 'plugin' => 'Плагин', + 'stage_setup' => 'Установка', + 'stage_test' => 'тестирование', 'stage_complete' => 'Завершение', - 'stage_success' => 'Успешное завершение', - 'stage_failure' => 'Провал', - 'stage_broken' => 'Поломка', - 'stage_fixed' => 'Исправление', + 'stage_success' => 'Успешное завершение', + 'stage_failure' => 'Провал', + 'stage_broken' => 'Поломка', + 'stage_fixed' => 'Исправление', 'build_details' => 'Информация о сборке', 'commit_details' => 'Информация о коммита', @@ -431,9 +432,9 @@ PHPCI', // Error Levels: 'critical' => 'Критичный', - 'high' => 'Высокий', - 'normal' => 'Нормальный', - 'low' => 'Низкий', + 'high' => 'Высокий', + 'normal' => 'Нормальный', + 'low' => 'Низкий', // Plugins that generate errors: 'php_mess_detector' => 'PHP Mess Detector',