canvas-i18n-editor 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0777905a738e9fee9146ed71fef0f70fad8018df1f834e425cd9348bc7aa98f4'
-  data.tar.gz: da069aed8d20995f8bc51a464ea78a58a9873d93a3547a06eec987b199c8e5d0
+  metadata.gz: cce046eb29fbec10d9be6d2e2fb4e34c5e24f82c55d78182e62529c64e0759a9
+  data.tar.gz: 9f0a327f99ee1d5c947605d0a4012bf24ec28ffc84800d65c20de7d4b62636c9
 SHA512:
-  metadata.gz: ad3f83a7151abebeff87dd96232ff801374ecd11578ecd51de02835094284dd52c6ec1e28e0c1e4cf3964b34933ec987710f3b3ae3bd7651610580c4e5636a0b
-  data.tar.gz: ef6feaee7ba8125d6a443374a9262b129980a15c8e7837848a9e9a16c17e1f0924364553f888898b4071c346a3a5419dd9e2ec758952b763c71ff47708f0fe42
+  metadata.gz: 8b042981a09e3528b27e5cd1dd7a177cf3637bf3f336a6db76f8915446acfe272e3f4ff85f095d9dadd360870baf8a3d153b6cec6fe02b6301eec90a17ce66ac
+  data.tar.gz: 72c40f2f42a805af9d317aae0d8dc8e19515b29f88b828bc818c8935ab65463d6a84abc769b8324fd70779c1a61813d9860a5c7124c950e50920d6646fb4c817

data/bin/canvas-i18n-editor

@@ -8,8 +8,6 @@ require "json"
 
 Options = Struct.new(:translate_from, :translate_to, :mode, :apply_js)
 
-ACCEPTED_MODE = %w[canvas rails reverse].freeze
-
 LOCALE_FILE = "config/locales/zh-Hant.yml"
 JS_LOCALE_FILE = "public/javascripts/translations/zh-Hant.json"
 TMP_FILE = "/tmp/canvas-i18n"
@@ -20,26 +18,29 @@ def update_rails_i18n(args)
   # find key in config/locales/zh-Hant.yml
   data = File.readlines(LOCALE_FILE)
   keywords = raw_key.split(".")
-  current_layer = 1
   get_layer = -> { _1.match(/^\s*/)[0].size / 2 }
+  current_layer = 1
+  found_key_count = 0
   updated_flag = false
   File.open(TMP_FILE, "w:UTF-8") do |file|
     data[0..3].each { file.write(_1) }
     (4..data.size - 1).each do |line_index|
       line = data[line_index]
-      unless updated_flag
-        if data[line_index].match?(/^\s*#{keywords[0]}:/)
+      next_line = data[line_index + 1]
+      current_layer = get_layer[line]
+      if !updated_flag && current_layer == found_key_count + 1
+        if line.match?(/^\s{#{current_layer * 2}}#{keywords[0]}:/)
           line_number = line_index + 1
           key = keywords.shift
-          current_layer += 1
+          found_key_count += 1
           puts "find #{key} in line #{line_number}"
           # find last key, should update content now
           if keywords.empty?
             line = line.sub(/#{key}:\s?/, "#{key}: ").sub(/(?<=#{key}:\s).+/, "\"#{args.translate_to}\"")
             updated_flag = true
           end
-        elsif line_index < data.size - 1 && get_layer[data[line_index + 1]] < current_layer
-          # determine can't find key early, update with nested structure
+        elsif keywords.join(".") != raw_key && (line_index >= data.size - 1 || get_layer[next_line] < current_layer)
+          # there's at least one key found and reach last line in this scope
           update_nested_key(file, keywords, current_layer, args)
           updated_flag = true
         end
@@ -48,7 +49,9 @@ def update_rails_i18n(args)
       file.write(line)
     end
 
-    update_nested_key(file, keywords, current_layer, args) unless updated_flag
+    unless updated_flag
+      update_nested_key(file, keywords, current_layer, args)
+    end
     file.close
   end
   FileUtils.mv(TMP_FILE, LOCALE_FILE)
@@ -57,21 +60,32 @@ end
 
 def update_nested_key(file, keywords, current_layer, args)
   keywords[0..-2].each do |key|
-    file.write("#{' ' * 2 * current_layer}#{key}: \n")
+    file.write("#{" " * 2 * current_layer}#{key}: \n")
     current_layer += 1
   end
-  file.write("#{' ' * 2 * current_layer}#{keywords[-1]}: #{args.translate_to}\n")
+  file.write("#{" " * 2 * current_layer}#{keywords[-1]}: #{args.translate_to}\n")
 end
 
 def update_js(key, translate_to, apply_js)
+  add_js_key unless File.exist?(JS_LOCALE_FILE)
   data = File.read(JS_LOCALE_FILE)
-  data = data.sub(/(?<="#{key}":)"[^"]+"/, "\"#{translate_to}\"")
-  puts "update js translations"
+  key_part = data.match(/(?<="#{key}":)"[^"]+"/)
+  if key_part
+    data = data.sub(key_part[0], "\"#{translate_to}\"")
+    puts "update js translations"
+    File.write(JS_LOCALE_FILE, data)
+  else
+    add_js_key
+  end
 
-  File.write(JS_LOCALE_FILE, data)
   generate_hashed_js if apply_js
 end
 
+def add_js_key
+  puts "regenerate js translations"
+  `bundle exec rails i18n:generate_js`
+end
+
 def generate_hashed_js
   `rm public/dist/javascripts/translations/zh-Hant-*.json`
   puts "generate scoped js translations"
@@ -116,22 +130,24 @@ def update_from_content(args)
   # TODO: use key(full key) to update_js
 end
 
+def ask_translate_to(translate_from)
+  printf "what's the content you want to translate \"#{translate_from}\" to ? "
+  STDIN.gets
+end
+
 class Parser
   def self.parse(user_input)
+    user_input.push("-h") if user_input.empty?
     args = Options.new
 
     opt_parser = OptionParser.new do |opts|
       opts.banner = "Usage:
       cool_i18n_edit translateFrom translateTo [options]
 
-      cool_i18n_edit -t canvas 'Click Me' '點我' # edit i18n using canvas liner-style key
-      cool_i18n_edit -t rails 'controller_name.action_name.click_me' '點我' # edit i18n using rails i18n key
+      cool_i18n_edit 'Click Me' '點我' # edit i18n using canvas liner-style key
+      cool_i18n_edit 'controller_name.action_name.click_me' '點我' # edit i18n using rails i18n key
       "
 
-      opts.on("-m MODE", "--mode MODE", "canvas, rails or reverse") do |mode|
-        args.mode = mode
-      end
-
       opts.on("-a", "--apply", "apply js translations") do
         args.apply_js = true
       end
@@ -143,11 +159,14 @@ class Parser
     end
 
     opt_parser.parse!(user_input) # options are remove after this line
-    raise "-m option not set" unless args.mode
-    raise "invalid -m option #{args.mode}\nonly below types are allowed\n#{ACCEPTED_MODE.join(",")}" unless ACCEPTED_MODE.include?(args.mode)
 
     args.translate_from = user_input[0].strip
-    args.translate_to = user_input[1].strip
+    args.translate_to = (user_input[1] || ask_translate_to(args.translate_from)).strip
+    args.mode = if args.translate_from.match?(/([a-zA-Z]+\.)+[a-zA-Z]+/)
+                  :rails
+                else
+                  :canvas
+                end
 
     args
   end
@@ -155,10 +174,8 @@ end
 
 args = Parser.parse(ARGV)
 case args.mode
-in "rails"
+in :rails
   update_rails_i18n(args)
-in "canvas"
+in :canvas
   update_canvas_i18n(args)
-in "reverse"
-  update_from_content(args)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canvas-i18n-editor
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Pero
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-28 00:00:00.000000000 Z
+date: 2023-06-29 00:00:00.000000000 Z
 dependencies: []
 description: i18n edit
 email: 0711kps@gmail.com
@@ -18,7 +18,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/canvas-i18n-editor
-homepage: https://rubygems.org/gems/hola
+homepage: https://rubygems.org/gems/canvas-i18n-editor
 licenses:
 - MIT
 metadata: {}