fix: fix output

crowdin · May 24, 2024 · 939c7aa · 939c7aa
1 parent b74e4af
commit 939c7aa
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 17 deletions.
diff --git a/src/main/java/com/crowdin/cli/commands/Actions.java b/src/main/java/com/crowdin/cli/commands/Actions.java
@@ -39,7 +39,7 @@ NewAction<PropertiesWithFiles, ProjectClient> listSources(
         boolean deleteObsolete, String branchName, boolean noProgress, boolean treeView, boolean plainView);
 
     NewAction<PropertiesWithFiles, ProjectClient> listTranslations(
-        boolean noProgress, boolean treeView, boolean isLocal, boolean plainView, boolean useServerSources, boolean withInContextLang);
+        boolean noProgress, boolean treeView, boolean isLocal, boolean plainView, boolean useServerSources, boolean withInContextLang, boolean isUpload);
 
     NewAction<ProjectProperties, ProjectClient> listLanguages(BaseCli.LanguageCode code, boolean all, boolean noProgress, boolean plainView);
 

diff --git a/src/main/java/com/crowdin/cli/commands/actions/BundleDownloadAction.java b/src/main/java/com/crowdin/cli/commands/actions/BundleDownloadAction.java
@@ -64,7 +64,7 @@ public void act(Outputter out, ProjectProperties pb, ClientBundle client) {
 
         for (String file: extractedPaths) {
             String filePath = Utils.noSepAtStart(StringUtils.removeStart(file, baseTempDir.getAbsolutePath()));
-            out.println(OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.extracted_file"), filePath)));
+            out.println(OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.file_path"), filePath)));
         }
 
         if (!keepArchive) {

diff --git a/src/main/java/com/crowdin/cli/commands/actions/CliActions.java b/src/main/java/com/crowdin/cli/commands/actions/CliActions.java
@@ -60,9 +60,9 @@ public NewAction<PropertiesWithFiles, ProjectClient> listSources(
 
     @Override
     public NewAction<PropertiesWithFiles, ProjectClient> listTranslations(
-        boolean noProgress, boolean treeView, boolean isLocal, boolean plainView, boolean useServerSources, boolean withInContextLang
+        boolean noProgress, boolean treeView, boolean isLocal, boolean plainView, boolean useServerSources, boolean withInContextLang, boolean isUpload
     ) {
-        return new ListTranslationsAction(noProgress, treeView, isLocal, plainView, useServerSources, withInContextLang);
+        return new ListTranslationsAction(noProgress, treeView, isLocal, plainView, useServerSources, withInContextLang, isUpload);
     }
 
     @Override

diff --git a/src/main/java/com/crowdin/cli/commands/actions/ListTranslationsAction.java b/src/main/java/com/crowdin/cli/commands/actions/ListTranslationsAction.java
@@ -25,14 +25,16 @@ class ListTranslationsAction implements NewAction<PropertiesWithFiles, ProjectCl
     private boolean plainView;
     private boolean useServerSources;
     private boolean withInContextLang;
+    private boolean isUpload;
 
-    public ListTranslationsAction(boolean noProgress, boolean treeView, boolean isLocal, boolean plainView, boolean useServerSources, boolean withInContextLang) {
+    public ListTranslationsAction(boolean noProgress, boolean treeView, boolean isLocal, boolean plainView, boolean useServerSources, boolean withInContextLang, boolean isUpload) {
         this.noProgress = noProgress;
         this.treeView = treeView;
         this.isLocal = isLocal;
         this.plainView = plainView;
         this.useServerSources = useServerSources;
         this.withInContextLang = withInContextLang;
+        this.isUpload = isUpload;
     }
 
     @Override
@@ -54,7 +56,7 @@ public void act(Outputter out, PropertiesWithFiles pb, ProjectClient client) {
         PlaceholderUtil placeholderUtil = new PlaceholderUtil(
             project.getSupportedLanguages(), project.getProjectLanguages(!isLocal), pb.getBasePath());
 
-        (new DryrunTranslations(pb, project.getLanguageMapping(), placeholderUtil, project.getProjectLanguages(withInContextLang), false, files, useServerSources))
+        (new DryrunTranslations(pb, project.getLanguageMapping(), placeholderUtil, project.getProjectLanguages(withInContextLang), false, files, useServerSources, isUpload))
             .run(out, treeView, plainView);
     }
 }
diff --git a/src/main/java/com/crowdin/cli/commands/functionality/DryrunTranslations.java b/src/main/java/com/crowdin/cli/commands/functionality/DryrunTranslations.java
@@ -25,8 +25,10 @@ public class DryrunTranslations extends Dryrun {
 
     public DryrunTranslations(
         PropertiesWithFiles pb, LanguageMapping projectLanguageMapping, PlaceholderUtil placeholderUtil,
-        List<Language> languages, boolean filesMustExist, Map<String, File> projectSources, boolean useServerSources
+        List<Language> languages, boolean filesMustExist, Map<String, File> projectSources, boolean useServerSources, boolean isUpload
     ) {
+
+        super(isUpload ? "message.uploading_file" : "message.file_path");
         this.pb = pb;
         this.placeholderUtil = placeholderUtil;
         this.filesMustExist = filesMustExist;

diff --git a/src/main/java/com/crowdin/cli/commands/picocli/ConfigTranslationsSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/ConfigTranslationsSubcommand.java
@@ -20,7 +20,7 @@ class ConfigTranslationsSubcommand extends ActCommandWithFiles {
 
     @Override
     protected NewAction<PropertiesWithFiles, ProjectClient> getAction(Actions actions) {
-        return actions.listTranslations(this.noProgress, this.treeView, false, this.plainView, false, true);
+        return actions.listTranslations(this.noProgress, this.treeView, false, this.plainView, false, true, false);
     }
 
     @Override

diff --git a/src/main/java/com/crowdin/cli/commands/picocli/DownloadSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/DownloadSubcommand.java
@@ -63,7 +63,7 @@ class DownloadSubcommand extends ActCommandWithFiles {
     @Override
     protected NewAction<PropertiesWithFiles, ProjectClient> getAction(Actions actions) {
         return (dryrun)
-            ? actions.listTranslations(noProgress, treeView, false, plainView, all, true)
+            ? actions.listTranslations(noProgress, treeView, false, plainView, all, true, false)
             : actions.download(new FsFiles(), noProgress, languageIds, excludeLanguageIds, pseudo, branchName, ignoreMatch, isVerbose, plainView, all, keepArchive);
     }
 

diff --git a/src/main/java/com/crowdin/cli/commands/picocli/UploadTranslationsSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/UploadTranslationsSubcommand.java
@@ -39,7 +39,7 @@ class UploadTranslationsSubcommand extends ActCommandWithFiles {
     @Override
     protected NewAction<PropertiesWithFiles, ProjectClient> getAction(Actions actions) {
         return (dryrun)
-            ? actions.listTranslations(noProgress, treeView, true, plainView, false, false)
+            ? actions.listTranslations(noProgress, treeView, true, plainView, false, false, true)
             : actions.uploadTranslations(noProgress, languageId, branch, importEqSuggestions, autoApproveImported, translateHidden, debug, plainView);
     }
 

diff --git a/src/main/resources/messages/messages.properties b/src/main/resources/messages/messages.properties
@@ -646,7 +646,6 @@ message.build_archive=Building ZIP archive with the latest translations
 message.build_archive_pseudo=Building ZIP archive with the pseudo-localized translation files
 message.building_translation=Building translation (%d%%)
 message.building_reviewed_sources=Building reviewed sources (%d%%)
-message.extracted_file=Extracted: '%s'
 message.archive=Archive: '%s'
 message.downloaded_files_omitted=Downloaded translations don't match the current project configuration. The translations for the following sources will be omitted (use --verbose to get the list of the omitted translations)\:
 message.downloaded_files_omitted_without_sources=Due to missing respective sources, the following translations will be omitted\:

diff --git a/src/test/java/com/crowdin/cli/commands/actions/CliActionsTest.java b/src/test/java/com/crowdin/cli/commands/actions/CliActionsTest.java
@@ -39,7 +39,7 @@ public void testListSources() {
 
     @Test
     public void testListTranslations() {
-        assertNotNull(actions.listTranslations(false, false, false, false, false, false));
+        assertNotNull(actions.listTranslations(false, false, false, false, false, false, false));
     }
 
     @Test

diff --git a/src/test/java/com/crowdin/cli/commands/actions/ListTranslationsActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/ListTranslationsActionTest.java
@@ -46,7 +46,7 @@ public void testForServerInteraction() throws ResponseException {
                 .thenReturn(ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
                         .addFile("first.po", "gettext", 101L, null, null).build());
 
-        NewAction<PropertiesWithFiles, ProjectClient> action = new ListTranslationsAction(false, false, false, false, false, false);
+        NewAction<PropertiesWithFiles, ProjectClient> action = new ListTranslationsAction(false, false, false, false, false, false, false);
         action.act(Outputter.getDefault(), pb, client);
 
         verify(client).downloadFullProject();

diff --git a/src/test/java/com/crowdin/cli/commands/picocli/ConfigTranslationsSubcommandTest.java b/src/test/java/com/crowdin/cli/commands/picocli/ConfigTranslationsSubcommandTest.java
@@ -11,7 +11,7 @@ public class ConfigTranslationsSubcommandTest extends PicocliTestUtils {
     public void testListTranslations() {
         this.execute(CommandNames.CONFIG, CommandNames.TRANSLATIONS);
         verify(actionsMock)
-            .listTranslations(anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean());
+            .listTranslations(anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean());
         this.check(true);
     }
 }
diff --git a/src/test/java/com/crowdin/cli/commands/picocli/DownloadSubcommandTest.java b/src/test/java/com/crowdin/cli/commands/picocli/DownloadSubcommandTest.java
@@ -26,7 +26,7 @@ public void testDownload() {
     public void testDownloadDryrun() {
         this.execute(CommandNames.DOWNLOAD, "--dryrun");
         verify(actionsMock)
-            .listTranslations(anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean());
+            .listTranslations(anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean());
         this.check(true);
     }
 

diff --git a/src/test/java/com/crowdin/cli/commands/picocli/PicocliTestUtils.java b/src/test/java/com/crowdin/cli/commands/picocli/PicocliTestUtils.java
@@ -64,7 +64,7 @@ void mockActions() {
             .thenReturn(actionMock);
         when(actionsMock.listSources(anyBoolean(), any(), anyBoolean(), anyBoolean(), anyBoolean()))
             .thenReturn(actionMock);
-        when(actionsMock.listTranslations(anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean()))
+        when(actionsMock.listTranslations(anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean()))
             .thenReturn(actionMock);
         when(actionsMock.status(anyBoolean(), any(), any(), any(), any(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean()))
             .thenReturn(actionMock);

diff --git a/src/test/java/com/crowdin/cli/commands/picocli/UploadTranslationsSubcommandTest.java b/src/test/java/com/crowdin/cli/commands/picocli/UploadTranslationsSubcommandTest.java
@@ -20,7 +20,7 @@ public void testUploadTranslations() {
     public void testUploadTranslationsDryrun() {
         this.execute(CommandNames.UPLOAD, CommandNames.UPLOAD_TRANSLATIONS, "--dryrun");
         verify(actionsMock)
-            .listTranslations(anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean());
+            .listTranslations(anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean());
         this.check(true);
     }
 }