applocale 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c867fde40c4818fa8274896d0386329514bc356b
-  data.tar.gz: 572063f121578458ff781751eda3a4a5ca7104ca
+  metadata.gz: 06a01f99dce9df71c355dfbe1a03b85fac6cb9b4
+  data.tar.gz: 8b7a559af7ab08cf16284bee8d78eb37277ac35f
 SHA512:
-  metadata.gz: e77ca0d49da189afc99bc5d94a16dc600c9bc53bde9bb26c99456e53a158059bb89f78bcb63ca503516a7ec4e98b260018221b73374bdf727bc6acc541a03f4c
-  data.tar.gz: 4fe91b4192ac5a3cb4b4d861a07f18cdf03bc039e3b8c4a27e0743d37143b41a736fe46dde4c85701f9675ac6401f9a6eef8d4137e55db4d91728122c2513d0e
+  metadata.gz: 86e57f20ab0ea767f5dc54a1e15d9d20b6d97fb467bcfd4786ec3a93217922b75d225d39bbd4d5bd0a11b2201bea49137e922cb6a391f31d09d60f6f99b94c0e
+  data.tar.gz: 64ecc8367c813080d9cc9a48304e1f8dff02955d319de749458134156528fd189bac8e119b38259cd8e9c94d190c8ec95ec3f8605a6da319d3605203fb0c6415

data/lib/applocale/AppLocaleFile

@@ -1,7 +1,7 @@
 link: "https://docs.google.com/spreadsheets/d/1Wy2gN_DSw-TCU2gPCzqvYxLfFG5fyK5rodXs5MLUy8w"
 platform: "#{platform}"
 xlsxpath: "#{xlsxpath}"
-export_format: :#{export_format}
+export_format: "#{export_format}"
 ＃google_credentials_path: "#{google_credentials_path}"
 langlist:
     zh_TW: "#{path_zh_TW}"

data/lib/applocale/Core/convert_to_localefile.rb

@@ -28,10 +28,43 @@ module Applocale
 
     def self.convert_to_stringfile(platform, langpath_obj, sheetcontent_list, injectObj)
       FileUtils.mkdir_p(File.dirname(langpath_obj.filepath))
+      file_header_comment = []
+      is_double_dash_comment = false
+      is_multiline_comment = false
+      File.open(langpath_obj.filepath, 'r').each do |line|
+        if is_double_dash_comment
+          break unless line.strip.start_with?('//')
+          file_header_comment.push(line)
+          next
+        end
+
+        if is_multiline_comment
+          file_header_comment.push(line)
+          break if line.include?('*/')
+        end
+
+        unless is_multiline_comment or is_double_dash_comment
+          case
+          when line.chomp.empty?
+            file_header_comment.push(line)
+          when line.strip.start_with?('//')
+            is_double_dash_comment = true
+            file_header_comment.push(line)
+          when line.strip.start_with?('/*') && !line.strip.start_with?('/**')
+            is_multiline_comment = true
+            file_header_comment.push(line)
+          else
+            break
+          end
+        end
+      end
+
       target = open(langpath_obj.filepath, 'w')
-      sheetcontent_list.each do |sheetcontent|
+      target.puts file_header_comment.join('') if is_double_dash_comment or is_multiline_comment
+      sheetcontent_list.each_with_index do |sheetcontent, index|
         contentlist = sheetcontent.get_rowInfo_sortby_key
         next if contentlist.length <= 0
+        target.puts('') if index > 0 or !file_header_comment.empty?
         target.puts('/*******************************')
         target.puts(" *   #{sheetcontent.comment}")
         target.puts(' *******************************/')
@@ -41,7 +74,6 @@ module Applocale
           value = self.add_escape(platform, langpath_obj.lang, rowinfo.key_str, content, injectObj)
           target.puts("\"#{rowinfo.key_str}\" = \"#{value}\";")
         end
-        target.puts('')
       end
       target.close
     end

data/lib/applocale/Util/config_util.rb

@@ -107,6 +107,7 @@ module Applocale
           end
         end
 
+        export_format = 'xlsx' if export_format.nil?
         case export_format
         when 'csv', 'xlsx'
           setting.export_format = export_format

data/lib/applocale/version.rb

@@ -1,3 +1,3 @@
 module Applocale
-  VERSION = "0.2.5"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: applocale
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7
 platform: ruby
 authors:
 - Kennix
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-19 00:00:00.000000000 Z
+date: 2018-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: for mobile application to manage locale