terrestrial-cli 0.1.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eff2d2337528b5b9713b26919a393b2b145f6d2c
-  data.tar.gz: 1c12b3c56e54a0e81832ca9807ecb1ff8ba35a0a
+  metadata.gz: 6f9c9727a09008ddfadbf7834495b7a217537f0a
+  data.tar.gz: 7eed9f1dc4c523a1272637511a2066fd41c525a4
 SHA512:
-  metadata.gz: c05e9799ac90e76144055d2ad37efeffbb7416e4edfe6647fa07470a41dd0912f3b89ebdb19dfc20d3f0b1c22cce35026becaecc11570bfb2e8684a331964d2a
-  data.tar.gz: b759606eef9ea8b17bb48e993331bf9053057ba65d0e96f8da0fe34d89e40cef6c98416aa5b5a77cae15db27e1cda0fade66d020bd9173a367faa267ad455f24
+  metadata.gz: 5ae1e63c73556277ed65a685312f66f252e3168ace1442ad3d2e8b256f52737951b4e38204cd16281d1e6e44dd1d13b5c3e68805c336d83f0aeb2444c2c98e1d
+  data.tar.gz: 5dfdfb649948aeb742fd78f1acbb08dda7e8367920a58e87eb038d7b400cc5f22c8388bb34992d1c744da58f3e98b06cdb1bec4fafd0ac1124fd3a2575074051

data/lib/terrestrial/cli/dot_strings_formatter.rb

@@ -8,9 +8,18 @@ module Terrestrial
 
       def format_foreign_translation
         result = []
-        entries.each do |entry|
-          # Just ID and string needed for translation
-          # files. Extra metadata is found in Base.lproj.
+        entries.reject(&:placeholder?).each do |entry|
+          # just id and string needed for translation
+          # files. extra metadata is found in base.lproj.
+          result << "\"#{entry.identifier}\"=\"#{entry.string}\";"
+          result << ""
+        end
+
+        result.concat(placeholder_disclaimer)
+
+        entries.select(&:placeholder?).each do |entry|
+          # just id and string needed for translation
+          # files. extra metadata is found in base.lproj.
           result << "\"#{entry.identifier}\"=\"#{entry.string}\";"
           result << ""
         end
@@ -29,6 +38,14 @@ module Terrestrial
 
       private
 
+      def placeholder_disclaimer
+        [
+          "// The following translations have been copied from the project base language because no translation was provided for them.",
+          "// iOS requires each Localizable.strings file to contain all keys used in the project. In order to provide proper fallbacks, Terrestrial includes missing translations in each translation resource file.", 
+          ""
+        ]
+      end
+
       def file_comments(entry)
         ["// Files:"] + 
           entry

data/lib/terrestrial/cli/flight/ios_workflow.rb

@@ -38,7 +38,8 @@ module Terrestrial
 
         def create_path_to_localization_files
           folder_name = Pathname.new(Dir[Config[:directory] + "/*.xcodeproj"].first).basename(".*").to_s
-          base_lproj_path = FileUtils.mkdir_p(Config[:directory] + "/#{folder_name}" + "/Base.lproj").first
+          project_language = detect_project_language(folder_name)
+          base_lproj_path = FileUtils.mkdir_p(Config[:directory] + "/#{folder_name}" + "/#{project_language}.lproj").first
 
           base_lproj_path + "/Localizable.strings"
         end
@@ -53,10 +54,15 @@ module Terrestrial
           Config.update_project_config
         end
 
+        def detect_project_language(folder)
+          info_plist = Dir[Config[:directory] + "/#{folder}/Info.plist"].first
+          `defaults read '#{info_plist}' CFBundleDevelopmentRegion`.gsub("\n", "").squeeze(" ")
+        end
+
         def print_done_message(lproj_folder)
           puts "------------------------------------"
           puts "-- Done!"
-          puts "- Created Base.lproj in #{lproj_folder}."
+          puts "- Localizable.strings created in #{lproj_folder}"
           puts "- All strings in source substituted with IDs."
           puts "- Remember to include the new localization files in your project!"
         end

data/lib/terrestrial/cli/init.rb

@@ -68,6 +68,8 @@ module Terrestrial
           else
             puts "Tracking #{@translation_files.count} files!"
           end
+        else
+          puts "Could not find any localization files to track."
         end
       end
 

data/lib/terrestrial/cli/pull/processes_translations.rb

@@ -0,0 +1,63 @@
+module Terrestrial
+  module Cli
+    class Pull < Command
+      class ProcessesTranslations
+        def self.run(translations, local_strings, platform)
+          new(translations, local_strings, platform).run
+        end
+
+        def initialize(translations, local_strings, platform)
+          @translations = translations
+          @local_strings = local_strings
+          @platform = platform
+        end
+
+        def run
+          case platform
+          when "ios"
+            process_ios
+          when "android"
+            process_android
+          else
+            raise "Unknown platform"
+          end
+        end
+
+        def process_android
+          translations
+            .reject {|entry| entry["translation"].nil? || entry["translation"].empty? }
+            .map    {|entry| TranslatedString.new(entry["translation"], entry["id"], false) }
+        end
+
+        def process_ios
+          local_strings.map do |local_string|
+            match = find_translation_for_id(local_string["identifier"])
+            if match
+              TranslatedString.new(match["translation"], match["id"], false)
+            else
+              TranslatedString.new(local_string["string"], local_string["identifier"], true)
+            end
+          end
+        end
+
+        def find_translation_for_id(id)
+          translations.detect {|t| t["id"] == id }
+        end
+
+        private
+
+        def translations
+          @translations
+        end
+
+        def local_strings
+          @local_strings
+        end
+
+        def platform
+          @platform
+        end
+      end
+    end
+  end
+end

data/lib/terrestrial/cli/pull.rb

@@ -1,3 +1,4 @@
+require 'terrestrial/cli/pull/processes_translations'
 require 'pathname'
 require 'fileutils'
 
@@ -31,9 +32,7 @@ module Terrestrial
       def update_translation_file(language, translations)
         write_translation_file(
           translation_file_path_for(language),
-          translations
-            .reject {|entry| entry["translation"].nil? || entry["translation"].empty? }
-            .map    {|entry| TranslatedString.new(entry["translation"], entry["id"]) }
+          ProcessesTranslations.run(translations, string_registry.entries, Config[:platform])
         )
       end
 
@@ -99,11 +98,15 @@ module Terrestrial
         @response
       end
 
+      def string_registry
+        @string_registry ||= StringRegistry.load
+      end
+
       def web_client
         @web_client ||= Web.new
       end
 
-      class TranslatedString < Struct.new(:string, :identifier)
+      class TranslatedString < Struct.new(:string, :identifier, :placeholder?)
       end
     end
   end

data/lib/terrestrial/cli/version.rb

@@ -1,5 +1,5 @@
 module Terrestrial
   module Cli
-    VERSION = "0.1.1"
+    VERSION = "0.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terrestrial-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Niklas Begley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: terminal-table
@@ -149,6 +149,7 @@ files:
 - lib/terrestrial/cli/parser/swift.rb
 - lib/terrestrial/cli/photoshoot.rb
 - lib/terrestrial/cli/pull.rb
+- lib/terrestrial/cli/pull/processes_translations.rb
 - lib/terrestrial/cli/push.rb
 - lib/terrestrial/cli/scan.rb
 - lib/terrestrial/cli/string_registry.rb