Merge branch 'release/4.3.1' into versions

FlineDev · Oct 6, 2020 · fb18f5f · fb18f5f
2 parents 42a6dd8 + dfff5a0
commit fb18f5f
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 20 deletions.
diff --git a/BartyCrouch.podspec b/BartyCrouch.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "BartyCrouch"
-  s.version      = "4.3.0"
+  s.version      = "4.3.1"
   s.summary      = "Localization/I18n: Incrementally update/translate your Strings files from .swift, .h, .m(m), .storyboard or .xib files."
 
   s.description  = <<-DESC

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -31,6 +31,11 @@ If needed, pluralize to `Tasks`, `PRs` or `Authors` and list multiple entries se
 ### Security
 - None.
 
+## [4.3.1] - 2020-10-06
+### Fixed
+- Fix missing usage of `harmonizeWithSource` parameter for `normalize` task.  
+  Issue: [#196](https://github.com/Flinesoft/BartyCrouch/issues/196) | PR: [#182](https://github.com/Flinesoft/BartyCrouch/pull/197) | Author: [Marco Pagliari](https://github.com/lechuckcaptain)
+
 ## [4.3.0] - 2020-09-28
 ### Changed
 - Updated swift-syntax to match Swift 5.3.  

diff --git a/Formula/bartycrouch.rb b/Formula/bartycrouch.rb
@@ -1,7 +1,7 @@
 class Bartycrouch < Formula
   desc "Incrementally update/translate your Strings files"
   homepage "https://github.com/Flinesoft/BartyCrouch"
-  url "https://github.com/Flinesoft/BartyCrouch.git", :tag => "4.2.0", :revision => "49b4cf27d5b521abf615d4ccb7754d642205f802"
+  url "https://github.com/Flinesoft/BartyCrouch.git", :tag => "4.3.0", :revision => "42a6dd8305b72f7a9f89c1625803503adcef0350"
   head "https://github.com/Flinesoft/BartyCrouch.git"
 
   depends_on :xcode => ["12.0", :build]

diff --git a/README.md b/README.md
@@ -14,8 +14,8 @@
         <img src="https://api.codacy.com/project/badge/Coverage/7b34ad9193c2438aa32aa29a0490451f"/>
     </a>
     <a href="https://github.com/Flinesoft/BartyCrouch/releases">
-        <img src="https://img.shields.io/badge/Version-4.3.0-blue.svg"
-             alt="Version: 4.3.0">
+        <img src="https://img.shields.io/badge/Version-4.3.1-blue.svg"
+             alt="Version: 4.3.1">
     </a>
     <img src="https://img.shields.io/badge/Swift-5.3-FFAC45.svg"
          alt="Swift: 5.3">
@@ -407,8 +407,9 @@ After Release Checklist:
 
 1. Run `make portable_zip` to generate `.build/release/portable_bartycrouch.zip`
 2. Create new release with text from new `CHANGELOG.md` section & attach `portable_bartycrouch.zip` as binary
-2. Update `tag` and `revision` in `Formula/bartycrouch.rb`, commit & push change
-3. Run `brew bump-formula-pr bartycrouch --tag=<tag> --revision=<revision>`
+3. Run `pod trunk push` to make a new release known to CocoaPods
+4. Update `tag` and `revision` in `Formula/bartycrouch.rb`, commit & push change
+5. Run `brew bump-formula-pr bartycrouch --tag=<tag> --revision=<revision>`
 
 ## License
 This library is released under the [MIT License](http://opensource.org/licenses/MIT). See LICENSE for details.
diff --git a/Sources/BartyCrouch/main.swift b/Sources/BartyCrouch/main.swift
@@ -5,7 +5,7 @@ import SwiftCLI
 // MARK: - CLI
 let cli = CLI(
     name: "bartycrouch",
-    version: "4.3.0",
+    version: "4.3.1",
     description: "Incrementally update & translate your Strings files from code or interface files."
 )
 

diff --git a/Sources/BartyCrouchKit/OldCommandLine/CommandLineActor.swift b/Sources/BartyCrouchKit/OldCommandLine/CommandLineActor.swift
@@ -118,20 +118,21 @@ public class CommandLineActor {
                 }
             }
 
-            for filePath in targetStringsFilePaths {
-                let stringsFileUpdater = StringsFileUpdater(path: filePath)
-                do {
-                    try stringsFileUpdater?.harmonizeKeys(withSource: sourceFilePath)
-                } catch {
-                    print("Could not harmonize keys with source file at path \(sourceFilePath).", level: .error)
-                    continue
+            if harmonizeWithSource {
+                for filePath in targetStringsFilePaths {
+                    let stringsFileUpdater = StringsFileUpdater(path: filePath)
+                    do {
+                        try stringsFileUpdater?.harmonizeKeys(withSource: sourceFilePath)
+                    } catch {
+                        print("Could not harmonize keys with source file at path \(sourceFilePath).", level: .error)
+                        continue
+                    }
                 }
             }
 
-            for filePath in allStringsFilePaths {
-                let stringsFileUpdater = StringsFileUpdater(path: filePath)
-
-                if sortByKeys {
+            if sortByKeys {
+                for filePath in allStringsFilePaths {
+                    let stringsFileUpdater = StringsFileUpdater(path: filePath)
                     stringsFileUpdater?.sortByKeys()
                 }
             }

diff --git a/Sources/SupportingFiles/Info.plist b/Sources/SupportingFiles/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.3.0</string>
+	<string>4.3.1</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/Tests/BartyCrouchTranslatorTests/MicrosoftTranslatorApiTests.swift b/Tests/BartyCrouchTranslatorTests/MicrosoftTranslatorApiTests.swift
@@ -17,7 +17,7 @@ class MicrosoftTranslatorApiTests: XCTestCase {
         switch endpoint.request(type: [TranslateResponse].self) {
         case let .success(translateResponses):
             XCTAssertEqual(translateResponses[0].translations[0].to, "de")
-            XCTAssertEqual(translateResponses[0].translations[0].text, "Wie alt sind Sie?")
+            XCTAssertEqual(translateResponses[0].translations[0].text, "Wie alt bist du?")
 
             XCTAssertEqual(translateResponses[0].translations[1].to, "tr")
             XCTAssertEqual(translateResponses[0].translations[1].text, "Kaç yaşındasınız?")