From 6adb2496363f06ec2f2899a07b52ee2bf0b2d82f Mon Sep 17 00:00:00 2001 From: Almaz Nasibullin Date: Thu, 8 Jun 2023 17:16:25 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D1=8B=20=D1=81?= =?UTF-8?q?=D0=BE=D1=80=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B8=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Исправлено описание команды, параметров и имен параметров для команды сортировки проекта. --- .../e1c/v8codestyle/internal/autosort/cli/Messages.java | 4 ++-- .../v8codestyle/internal/autosort/cli/SortCommand.java | 8 ++++---- .../v8codestyle/internal/autosort/cli/messages.properties | 6 +++--- .../internal/autosort/cli/messages_ru.properties | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bundles/com.e1c.v8codestyle.autosort/src/com/e1c/v8codestyle/internal/autosort/cli/Messages.java b/bundles/com.e1c.v8codestyle.autosort/src/com/e1c/v8codestyle/internal/autosort/cli/Messages.java index 6dee5fc1..f57014a7 100644 --- a/bundles/com.e1c.v8codestyle.autosort/src/com/e1c/v8codestyle/internal/autosort/cli/Messages.java +++ b/bundles/com.e1c.v8codestyle.autosort/src/com/e1c/v8codestyle/internal/autosort/cli/Messages.java @@ -25,8 +25,8 @@ final class Messages public static String SortCommand_Description; public static String SortCommand_Project__0__did_not_import_into_workspace; public static String SortCommand_Project__0__not_found_in_workspace; - public static String SortCommand_Project_names_Description; - public static String SortCommand_Project_paths_Description; + public static String SortCommand_Projects; + public static String SortCommand_Projects_location; public static String SortCommand_Sort_project__0__finished; public static String SortCommand_Sort_projects__0; static diff --git a/bundles/com.e1c.v8codestyle.autosort/src/com/e1c/v8codestyle/internal/autosort/cli/SortCommand.java b/bundles/com.e1c.v8codestyle.autosort/src/com/e1c/v8codestyle/internal/autosort/cli/SortCommand.java index 0604d3b6..bd878c85 100644 --- a/bundles/com.e1c.v8codestyle.autosort/src/com/e1c/v8codestyle/internal/autosort/cli/SortCommand.java +++ b/bundles/com.e1c.v8codestyle.autosort/src/com/e1c/v8codestyle/internal/autosort/cli/SortCommand.java @@ -60,8 +60,8 @@ public class SortCommand * @return the status of command */ @CliCommand(command = "sort-project", value = "SortCommand_Description") - public IStatus importAndSortProjects(@Argument(value = "--projects", elementType = Path.class, - descriptor = "SortCommand_Project_paths_Description") Path[] projectPaths) + public IStatus importAndSortProjects(@Argument(value = "--project-list", elementType = Path.class, + descriptor = "SortCommand_Projects_location") Path[] projectPaths) { if (projectPaths == null || projectPaths.length == 0) { @@ -109,8 +109,8 @@ public class SortCommand * @return the status of command */ @CliCommand(command = "sort-project", value = "SortCommand_Description") - public IStatus sortExistingProjects(@Argument(value = "--project-names", elementType = IProject.class, - descriptor = "SortCommand_Project_names_Description") IProject[] projectNames) + public IStatus sortExistingProjects(@Argument(value = "--project-name-list", elementType = IProject.class, + descriptor = "SortCommand_Projects") IProject[] projectNames) { if (projectNames == null || projectNames.length == 0) { diff --git a/bundles/com.e1c.v8codestyle.autosort/src/com/e1c/v8codestyle/internal/autosort/cli/messages.properties b/bundles/com.e1c.v8codestyle.autosort/src/com/e1c/v8codestyle/internal/autosort/cli/messages.properties index cb5e350e..a11feb4f 100644 --- a/bundles/com.e1c.v8codestyle.autosort/src/com/e1c/v8codestyle/internal/autosort/cli/messages.properties +++ b/bundles/com.e1c.v8codestyle.autosort/src/com/e1c/v8codestyle/internal/autosort/cli/messages.properties @@ -12,15 +12,15 @@ # 1C-Soft LLC - initial API and implementation ############################################################################### -SortCommand_Description = Sort 1C:Enterprise projects with current auto-sort settings. If auto-sorting is not enabled yet, then default sort settings will enable for the project. +SortCommand_Description = Sorts configuration objects according to the automatic sorting settings. If automatic sorting has not been enabled for the project, standard automatic sorting settings will be set, according to which configuration objects will be sorted. SortCommand_Project__0__did_not_import_into_workspace = Project "{0}" was not imported into workspace SortCommand_Project__0__not_found_in_workspace = Project "{0}" was not found in workspace -SortCommand_Project_names_Description = List of project names, imported into workspace earlier, which will be sorted +SortCommand_Projects = A list of project names to sort. -SortCommand_Project_paths_Description = List of project paths, which will be imported into workspace and will be sorted +SortCommand_Projects_location = A list of paths to the directories where the project files are located, while all nested projects are processed. If one of the projects is not imported into the workspace passed in the -data parameter, then before sorting the project, this project will be imported into the workspace. SortCommand_Sort_project__0__finished = Sort project "{0}" is finished. diff --git a/bundles/com.e1c.v8codestyle.autosort/src/com/e1c/v8codestyle/internal/autosort/cli/messages_ru.properties b/bundles/com.e1c.v8codestyle.autosort/src/com/e1c/v8codestyle/internal/autosort/cli/messages_ru.properties index b04db2dd..8a627945 100644 --- a/bundles/com.e1c.v8codestyle.autosort/src/com/e1c/v8codestyle/internal/autosort/cli/messages_ru.properties +++ b/bundles/com.e1c.v8codestyle.autosort/src/com/e1c/v8codestyle/internal/autosort/cli/messages_ru.properties @@ -13,15 +13,15 @@ ############################################################################### #Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/) -SortCommand_Description = Сортирует проекты 1С:Предприятия с текущиими настройками авто-сортировки. Если авто-сортировка еще не была включена, тогда для проекта включатся настройки сортировки по умолчанию. +SortCommand_Description = Сортирует объекты конфигурации в соответствии с настройками автоматической сортировки. Если автоматическая сортировка не была включена для проекта, будут установлены стандартные настройки автоматической сортировки, в соответствии с которыми объекты конфигурации будут отсортированы. SortCommand_Project__0__did_not_import_into_workspace = Проект "{0}" не был импортирован в рабочее пространство SortCommand_Project__0__not_found_in_workspace = Проект "{0}" не найден в рабочем пространстве -SortCommand_Project_names_Description = Список имен проектов, ранее импортированных в рабочее пространство, которые будут отсортированы +SortCommand_Projects = Список имен проектов для сортировки. -SortCommand_Project_paths_Description = Список путей к проектам, которые будут импортированы в рабочее пространство и отсортированы +SortCommand_Projects_location = Список путей к каталогам, в которых находятся файлы проектов, при этом обрабатываются все вложенные проекты. Если какой-то из проектов не импортирован в рабочую область, переданную в параметре -data, то перед сортировкой проекта будет выполнен импорт этого проекта в рабочую область. SortCommand_Sort_project__0__finished = Сортировка проекта "{0}" завершена.