i18n_checker 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '00138b291e22894b6beffebb4ab1332f98d5bae0'
-  data.tar.gz: ac641342d31374cd17b9292ff78808760ade2cf5
+  metadata.gz: 6a836e6d5da915e6a4067a784687348ed8cd980d
+  data.tar.gz: b3ab5d76dda32cb5924b96d99b0c5bfae393168b
 SHA512:
-  metadata.gz: 5a7be1b6c288c48ebf122d8797f7b49c951f247c52480fb420d0452cfcc5121ab31f1c0db0b53ddd54d7a665eea7ece23f4caa2f3e053bfe50d57ae0289d0cc9
-  data.tar.gz: 995d236b18d1c362e5a93fd322e64fa0b624ad3251ea677d1078ded0ca38594cf971a3d048863c3b487f14b1941dc46828709814b31d715d3a51147202769a12
+  metadata.gz: b47f50dcc54c37ec5ad1542dabce3fe8712814008cddb7d2b59d990a87f9d4f55f2dd778538961edcb99ca5b25f6d23c4c3ea8bbe4c12f570974262fe97e6230
+  data.tar.gz: 4ed1f941e6a9dd720d593157751d3d4dbb45daeebac9a447a59c7026d7b7ace59b7b3804b46499c0f1da22bf392de9c17ccb069f99d292321ef398bab5a92b37

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    i18n_checker (0.8.1)
+    i18n_checker (0.8.2)
       colorator (~> 1.1.0)
       haml_parser (~> 0.4)
       parser

data/lib/i18n_checker/cache.rb

@@ -111,8 +111,8 @@ module I18nChecker
         content[range.first - 1, range.last]
       end
 
-      def start_of(text)
-        content.index(text)
+      def start_of(text, at = 0)
+        content.index(text, at)
       end
 
       def to_s

data/lib/i18n_checker/locale/collector/haml.rb

@@ -43,26 +43,50 @@ module I18nChecker
           end
 
           def locale_text_from_script(script_node)
-            translate_script = script_node.script.match(/^t\(\'+(.+)\'+\)$/)
-            return unless translate_script
+            return if script_node.script == '""'
+            translate_scripts = translate_scripts_from_script(script_node)
+            return if translate_scripts.empty?
 
-            locale_text_key = translate_script[1]
-            file_cache = file_caches.read(script_node.filename)
-            column = file_cache[script_node.lineno].start_of(locale_text_key)
+            translate_scripts.map do |script_params|
+              (text_key, line, column) = script_params
+
+              locale_text = if text_key =~ /^\.(.+)/
+                              action_view = action_view_name_from_script(script_node)
+                              "#{action_view}#{text_key}"
+                            else
+                              text_key
+                            end
 
-            locale_text = if locale_text_key =~ /^\.(.+)/
-                            action_view = action_view_name_from_script(script_node)
-                            "#{action_view}#{locale_text_key}"
-                          else
-                            locale_text_key
-                          end
+              I18nChecker::Locale::Text.new(
+                file: script_node.filename,
+                line: line,
+                column: column,
+                text: locale_text,
+              )
+            end
+          end
 
-            I18nChecker::Locale::Text.new(
-              file: script_node.filename,
-              line: script_node.lineno,
-              column: column,
-              text: locale_text,
-            )
+          def translate_scripts_from_script(script_node)
+            results = []
+            file_cache = file_caches.read(script_node.filename)
+            script_lines = script_node.script.split('\n')
+            script_lines.each_with_index do |script_line, i|
+              offset_at = 0
+              translate_scripts = script_line.scan(/t\('[^']+'\)/)
+              map_results = translate_scripts.map do |script|
+                line = script_node.lineno + i
+                text_key = script.gsub!(/t\('|'\)/, '')
+                column = file_cache[line].start_of(text_key, offset_at)
+                offset_at = column + 1
+                [
+                  text_key,
+                  line,
+                  column
+                ]
+              end
+              results.concat(map_results)
+            end
+            results
           end
 
           # Translation key for lazy lookup

data/lib/i18n_checker/version.rb

@@ -1,3 +1,3 @@
 module I18nChecker
-  VERSION = '0.8.1'.freeze
+  VERSION = '0.8.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n_checker
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - holyshared