loco_strings 0.1.5 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b08530cf06fde825bb19978db9b25c6dd2def7fed991f7e3cc7769d24efafd34
-  data.tar.gz: 7fb65903ab8dcdcd5b20b6072ac6dc7934d994ff6353c857b144549a54a83953
+  metadata.gz: 45967a4d7a5f4a5ddc6d3fbeec661fcf7d9c096cade448616b7e096e3d41b3d5
+  data.tar.gz: e0f26ff5774aff74719a30811404f9834e26b3a96f0f800cb08a6a3f004a3f2b
 SHA512:
-  metadata.gz: 7e3c576ffdca90cf4e046dfc0c5f977538ca34504637d7d8b691063206f7c12ecb2f5a330fd26bb39647625652585dc33013364abdda23bf4833464a33e2ddcd
-  data.tar.gz: f49f067641e258367ebcc367121cc30b27feb062ea0fb42716f74c9d40ff622e1f1d397e4b3f308a6bfaf64a65ce53cccc27716126b4d1adf46fbc9f52b96d04
+  metadata.gz: '08dfd0d814825888c048dcc6ed25900b4dc2c5e85e82411a447c4d17b562ba99b57f98af8e0b18466a73cac316161ec06e6e0b8877fa9fcf9b24e1e257ef84e7'
+  data.tar.gz: 95c99ae564c6624e653efc459b7d75c974024912ca68df84acaf548836471752c42ada4e47e73a0e4ebebf19395f51b82ede7a1093381689849b8bf1ba0e42e8

data/lib/loco_strings/decoders/xcstrings_decoder.rb

@@ -5,7 +5,7 @@ require "json"
 module LocoStrings
   # The XCStringsDecoder class is responsible for decoding the XCStrings file format.
   class XCStringsDecoder
-    attr_reader :language, :strings, :translations, :languages
+    attr_reader :language, :strings, :translations, :languages, :extraction_states
 
     def initialize(file_path)
       @file_path = file_path
@@ -13,6 +13,7 @@ module LocoStrings
       @translations = {}
       @languages = []
       @language = nil
+      @extraction_states = {}
     end
 
     def decode
@@ -44,12 +45,13 @@ module LocoStrings
       strings = json["strings"]
       strings.each do |key, value|
         translatable = value.fetch("shouldTranslate", true)
+        @extraction_states[key] = value["extractionState"] if value.key?("extractionState")
         val = decode_string(key, value, @language)
         @strings[key] = val if val
         @strings[key] = LocoString.new(key, key, value["comment"], "new") if val.nil?
         @strings[key].translatable = translatable
 
-        decode_translations(key, value)
+        decode_translations(key, value, translatable)
       end
     end
 
@@ -98,9 +100,11 @@ module LocoStrings
       result
     end
 
-    def decode_translations(key, value)
+    def decode_translations(key, value, translatable = true)
       @languages.each do |language|
         string = decode_string(key, value, language)
+        # Carry the shouldTranslate flag onto the per-language unit so it round-trips on encode.
+        string.translatable = translatable if string
         @translations[language] ||= {}
         @translations[language][key] = string
       end

data/lib/loco_strings/encoders/xcstrings_encoder.rb

@@ -7,11 +7,12 @@ module LocoStrings
   class XCStringsEncoder
     attr_reader :language, :strings, :translations, :languages
 
-    def initialize(strings, translations, languages, language)
+    def initialize(strings, translations, languages, language, extraction_states = {})
       @strings = strings
       @translations = translations
       @languages = languages
       @language = language
+      @extraction_states = extraction_states || {}
     end
 
     def encode
@@ -43,7 +44,18 @@ module LocoStrings
       sorted_keys.each do |language|
         process_language(row, language, key)
       end
-      row
+      # Bare keys (no per-language unit, e.g. compiler-extracted source-only keys) have nothing for
+      # add_translation_flag to read — fall back to the source-string flag so shouldTranslate persists.
+      row["shouldTranslate"] = false if !row.key?("shouldTranslate") && @strings[key]&.translatable == false
+      state = @extraction_states[key]
+      return row if state.nil?
+
+      # Keep Xcode's alphabetical field order: comment, extractionState, localizations, shouldTranslate.
+      ordered = {}
+      ordered["comment"] = row.delete("comment") if row.key?("comment")
+      ordered["extractionState"] = state
+      ordered.merge!(row)
+      ordered
     end
 
     def sorted_keys

data/lib/loco_strings/parsers/xcstrings_file.rb

@@ -19,13 +19,14 @@ module LocoStrings
       @strings = decoder.strings
       @translations = decoder.translations
       @languages = decoder.languages
+      @extraction_states = decoder.extraction_states
       @strings
     end
 
     def write
       raise Error, "The base language is not defined" if @language.nil?
 
-      json = XCStringsEncoder.new(@strings, @translations, @languages, @language).encode
+      json = XCStringsEncoder.new(@strings, @translations, @languages, @language, @extraction_states || {}).encode
       File.write(@file_path, json)
     end
 
@@ -54,6 +55,11 @@ module LocoStrings
 
     def update_traslatability(key, translatable)
       @strings[key].translatable = translatable
+      # The encoder reads the flag from the per-language units, so set it there too.
+      @translations.each_value do |units|
+        unit = units[key]
+        unit.translatable = translatable if unit
+      end
     end
 
     def select_language(language)
@@ -99,6 +105,7 @@ module LocoStrings
       @translations = {}
       @languages = []
       @language = nil
+      @extraction_states = {}
     end
 
     private
@@ -118,7 +125,13 @@ module LocoStrings
     def make_variations(key, variant, value, comment = nil, state = nil, language = @language) # rubocop:disable Metrics/ParameterLists
       variants = @translations.dig(language, key)
 
-      return make_strings(key, value, comment, state, language) if variants.is_a?(LocoString)
+      # Upgrade a plain (e.g. compiler-extracted) flat string into a plural variation set the first
+      # time a variant is written for it — carrying over its comment. Without this, writing a
+      # variation onto an extracted key would silently fall back to a flat string and drop the plural.
+      if variants.is_a?(LocoString)
+        state = "new" if state.nil?
+        return LocoVariantions.new(key, { variant => LocoString.new(variant, value, comment, state) }, variants.comment)
+      end
 
       if variants.nil?
         state = "new" if state.nil?

data/lib/loco_strings/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LocoStrings
-  VERSION = "0.1.5"
+  VERSION = "0.1.9"
 end

data/lib/loco_strings.rb

@@ -46,7 +46,7 @@ module LocoStrings
       if strings.key? key
         strings[key].update(value, comment, state, translatable)
       else
-        strings[key] = LocoString.new(key, value, comment, state, nil, translatable)
+        strings[key] = LocoString.new(key, value, comment, state, translatable)
       end
     end
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: loco_strings
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.9
 platform: ruby
 authors:
 - Aleksei Cherepanov
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-26 00:00:00.000000000 Z
+date: 2026-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -69,7 +68,6 @@ metadata:
   homepage_uri: https://github.com/ftp27/loco_strings
   source_code_uri: https://github.com/ftp27/loco_strings
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -84,8 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: LocoStrings is a Ruby gem for working with iOS and Android localization strings.
 test_files: []