diff --git a/client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextDirStrategy.java b/client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextDirStrategy.java index c9a8095a52..84f880b4dc 100644 --- a/client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextDirStrategy.java +++ b/client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextDirStrategy.java @@ -139,7 +139,7 @@ public void visitTranslationResources(String docName, Resource srcDoc, Translati { InputSource inputSource = new InputSource(bis); inputSource.setEncoding("utf8"); - TranslationsResource targetDoc = poReader.extractTarget(inputSource, srcDoc, opts.getUseSourceOrder()); + TranslationsResource targetDoc = poReader.extractTarget(inputSource, srcDoc, opts.getUseSrcOrder()); callback.visit(locale, targetDoc); } finally diff --git a/client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PropertiesStrategy.java b/client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PropertiesStrategy.java index 7a2a4f08ae..8eaa862bae 100644 --- a/client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PropertiesStrategy.java +++ b/client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PropertiesStrategy.java @@ -139,7 +139,7 @@ private TranslationsResource loadTranslationsResource(Resource srcDoc, File tran // TODO consider using PropReader TranslationsResource targetDoc = new TranslationsResource(); Properties props = loadPropFile(transFile); - if (opts.getUseSourceOrder()) + if (opts.getUseSrcOrder()) { for (TextFlow tf : srcDoc.getTextFlows()) { @@ -194,7 +194,7 @@ public void visitTranslationResources(String docName, Resource srcDoc, Translati File transFile = new File(opts.getTransDir(), filename); if (transFile.exists()) { - TranslationsResource targetDoc = loadTranslationsResource(srcDoc, transFile, opts.getUseSourceOrder()); + TranslationsResource targetDoc = loadTranslationsResource(srcDoc, transFile, opts.getUseSrcOrder()); callback.visit(locale, targetDoc); } else diff --git a/client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java b/client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java index 807b352083..c9b495fb69 100644 --- a/client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java +++ b/client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java @@ -99,7 +99,7 @@ public void run() throws Exception log.info("Source language: {}", opts.getSourceLang()); log.info("Copy previous translations: {}", opts.getCopyTrans()); log.info("Merge type: {}", opts.getMergeType()); - log.info("Source Pattern: {}", opts.getSourcePattern()); + log.info("Source file pattern: {}", opts.getSrcFilePattern()); if (opts.getPushTrans()) { diff --git a/client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptions.java b/client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptions.java index 0a49ffc5e9..ef5db11193 100644 --- a/client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptions.java +++ b/client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptions.java @@ -12,8 +12,8 @@ public interface PushOptions extends ConfigurableProjectOptions public String getProjectType(); public boolean getPushTrans(); public boolean getCopyTrans(); - public boolean getUseSourceOrder(); + public boolean getUseSrcOrder(); public String getMergeType(); - public String getSourcePattern(); + public String getSrcFilePattern(); } diff --git a/client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/XliffStrategy.java b/client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/XliffStrategy.java index 744d8be6be..fa127081d0 100644 --- a/client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/XliffStrategy.java +++ b/client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/XliffStrategy.java @@ -55,7 +55,7 @@ public Set findDocNames(File srcDir) throws IOException sourceFiles = new HashSet(); Set localDocNames = new HashSet(); - srcPatternFilter = new WildcardFileFilter(opts.getSourcePattern()); + srcPatternFilter = new WildcardFileFilter(opts.getSrcFilePattern()); targetFileFilter = new TargetFileFilter(opts.getLocales(), XML_EXTENSION); srcFileFilter = new AndFileFilter(srcPatternFilter, targetFileFilter); diff --git a/client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/XliffStrategyTest.java b/client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/XliffStrategyTest.java index c670ff7574..49a4c374e0 100644 --- a/client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/XliffStrategyTest.java +++ b/client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/XliffStrategyTest.java @@ -56,7 +56,7 @@ public void findDocNamesTest() throws IOException XliffStrategy xliffStrategy = new XliffStrategy(); mockPushOption = createMock("mockPushOption", PushOptions.class); - EasyMock.expect(mockPushOption.getSourcePattern()).andReturn("*StringResource_en_US*"); + EasyMock.expect(mockPushOption.getSrcFilePattern()).andReturn("*StringResource_en_US*"); EasyMock.expect(mockPushOption.getLocales()).andReturn(locales).anyTimes(); EasyMock.expect(mockPushOption.getSourceLang()).andReturn("en-US").anyTimes(); @@ -77,7 +77,7 @@ public void loadSrcDocTest() throws IOException XliffStrategy xliffStrategy = new XliffStrategy(); mockPushOption = createMock("mockPushOption", PushOptions.class); - EasyMock.expect(mockPushOption.getSourcePattern()).andReturn("*StringResource_en_US*"); + EasyMock.expect(mockPushOption.getSrcFilePattern()).andReturn("*StringResource_en_US*"); EasyMock.expect(mockPushOption.getTransDir()).andReturn(sourceDir).anyTimes(); EasyMock.expect(mockPushOption.getLocales()).andReturn(locales).anyTimes(); EasyMock.expect(mockPushOption.getSourceLang()).andReturn("en-US").anyTimes(); diff --git a/client/zanata-maven-plugin/demo-xliff/pom.xml b/client/zanata-maven-plugin/demo-xliff/pom.xml index d28e8e9a28..715d26026f 100644 --- a/client/zanata-maven-plugin/demo-xliff/pom.xml +++ b/client/zanata-maven-plugin/demo-xliff/pom.xml @@ -17,7 +17,7 @@ xliff src - StringResource_en_US.xml + StringResource_en_US.xml src