haplo 2.4.4-java → 2.5.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d38c8194cc05037372ab34e9363c2628bfbb4ed51cc47e670c0619290120aab
-  data.tar.gz: 5e883a919cc840ae0061d48a2dcffeab49162133ae7c7da08480b81692232198
+  metadata.gz: c4debe71fe91f237e4c8536a6f172b841ffedf5807e83c77aeabf44f5dd95d69
+  data.tar.gz: 0e8b43f580f7767466cf333bfa7f847d5f834bce7b950918125ebe65e5422135
 SHA512:
-  metadata.gz: 07ce4f56cb7e9df0ad168cea69f1320cd4e7f9d391de6fb6f5dad5f7aa9224f6149764cacb67031ab87bb76e9b0bf03b8e17973384f9380eda346e4640c07cba
-  data.tar.gz: 45c710d47c7edf13767d8a776da483e16ec4e3df344576fc927ae25acca2d31debf44ed993771b911c69c5e266b09414143eb9c674ee169f03fa23a00dbc6f7e
+  metadata.gz: 4f954ab6515de58158e0eacc826b6023bdcc53af299ac4a38fc59762f3dd184de177348024573fcd4e81bf506de02f75ff4a4ed2b06237c03708f8bdbf3ef1eb
+  data.tar.gz: 6fc846cc2827a1e9b925c5dcb8adbc3c96f7c27a9b7d850ce76dea176b5b887c6869bd78170621fc912dd54029f2019d99d433af5aedc3215c86e086254618a4

data/haplo.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   files = Dir.glob("#{root_dir}/**/*.*").map { |x| x[root_dir.length + 1, x.length]}
 
   s.name        = 'haplo'
-  s.version     = '2.4.4'
-  s.date        = '2019-09-24'
+  s.version     = '2.5.0'
+  s.date        = '2019-09-25'
   s.summary     = "Haplo Plugin Tool"
   s.description = "Development tools for developing Haplo plugins, see https://haplo.org"
   s.licenses    = ["MPL-2.0"]

data/lib/i18n_extract_text.rb

@@ -0,0 +1,46 @@
+
+module PluginTool
+
+  def self.i18n_extract_text(plugins)
+    text = {}
+
+    # Get text from templates. This is exact, because each template is parsed.
+    parser_config = TemplateParserConfiguration.new
+    plugins.each do |plugin|
+      Dir.glob("#{plugin.plugin_dir}/template/**/*.hsvt").sort.each do |template|
+        template = Java::OrgHaploTemplateHtml::Parser.new(File.read(template), "extract", parser_config).parse()
+        template.extractTranslatedStrings().each do |string|
+          text[string] = string
+        end
+      end
+    end
+
+    # Get text from JS files, which isn't exact, because it just relies on convention and hopes for the best.
+    plugins.each do |plugin|
+      Dir.glob("#{plugin.plugin_dir}/js/**/*.js").sort.each do |js_file|
+        js = File.read(js_file)
+        [/\bi\['([^']+)'\]/, /\bi\["([^"]+)"\]/].each do |regexp|
+          js.scan(regexp) do
+            text[$1] = $1
+          end
+        end
+      end
+    end
+
+    # Last, add in any of the default locale's text, so where text is looked up by symbol, the translation is included.
+    plugins.each do |plugin|
+      ['global','local'].each do |scope|
+        maybe_strings = "#{plugin.plugin_dir}/i18n/#{scope}/#{plugin.default_locale_id}.template.json"
+        if File.exist?(maybe_strings)
+          strings = JSON.parse(File.read(maybe_strings))
+          strings.each do |k,v|
+            text[k] = v
+          end
+        end
+      end
+    end
+
+    puts JSON.pretty_generate(text)
+  end
+
+end

data/lib/plugin.rb

@@ -29,6 +29,11 @@ module PluginTool
     attr_accessor :depend
     attr_accessor :loaded_plugin_id
 
+    def default_locale_id
+      # TODO: Other default locales
+      'en'
+    end
+
     # ---------------------------------------------------------------------------------------------------------
 
     @@pending_apply = []

data/lib/plugin_tool.rb

@@ -17,7 +17,7 @@ end
 PluginTool.try_load_custom
 
 WORKSPACE_FILE = 'workspace.json'
-LOCAL_ONLY_COMMANDS = {"license-key" => true, "pack" => true, "check" => true, "new" => true, "list" => true}
+LOCAL_ONLY_COMMANDS = {"license-key" => true, "pack" => true, "check" => true, "new" => true, "list" => true, "extract-text" => true}
 NO_DEPENDENCY_COMMANDS = {"reset-db" => true}.merge(LOCAL_ONLY_COMMANDS)
 NO_DEPENDENCY_COMMANDS.delete('list')
 PLUGIN_SEARCH_PATH = ['.']
@@ -144,7 +144,7 @@ unless LOCAL_ONLY_COMMANDS[PLUGIN_TOOL_COMMAND]
   PluginTool.setup_auth(options)
   PluginTool.check_for_certificate_file
   application_info = PluginTool.get_application_info
-  puts "Remote application name: #{(application_info["name"]||'').to_s.strip.gsub(/\s+/,' ')}"
+  STDERR.puts "Remote application name: #{(application_info["name"]||'').to_s.strip.gsub(/\s+/,' ')}"
 end
 
 if PLUGIN_TOOL_COMMAND == 'devtools'
@@ -171,6 +171,18 @@ if PLUGIN_TOOL_COMMAND == 'template-debugging'
   end
 end
 
+if PLUGIN_TOOL_COMMAND == 'i18n-debugging'
+  disable = (ARGV[0] == 'disable')
+  puts disable ? "Disabling i18n debugging..." : "Enabling i18n debugging..."
+  if 'OK' == PluginTool.post("/api/development-plugin-loader/i18n-debugging?enable=#{disable ? '0' : '1'}")
+    puts "Done"
+    exit 0
+  else
+    puts "Error updating server"
+    exit 1
+  end
+end
+
 # If the user didn't requested a plugin, try to use the application info to select the root plugin
 if requested_plugins.empty? && application_info
   application_root_plugin = application_info["config"]["applicationRootPlugin"]
@@ -291,7 +303,7 @@ if PLUGIN_TOOL_COMMAND == 'list'
   exit 0
 end
 
-puts "#{plugins.length} plugin#{plugins.length != 1 ? 's' : ''}"
+STDERR.puts "#{plugins.length} plugin#{plugins.length != 1 ? 's' : ''}"
 
 # Custom behaviour for this repo?
 PluginTool.custom_behaviour.start(plugins, PLUGIN_TOOL_COMMAND, options, LOCAL_ONLY_COMMANDS[PLUGIN_TOOL_COMMAND])
@@ -304,6 +316,9 @@ when 'pack'
 when 'check'
   PluginTool.check_plugins(plugins)
   exit 0
+when 'extract-text'
+  PluginTool.i18n_extract_text(plugins)
+  exit 0
 end
 
 # Set up local plugin objects against server

data/lib/run.rb

@@ -70,4 +70,5 @@ require "#{PLUGIN_TOOL_ROOT_DIR}/lib/watchers.rb"
 require "#{PLUGIN_TOOL_ROOT_DIR}/lib/minimise.rb"
 require "#{PLUGIN_TOOL_ROOT_DIR}/lib/check.rb"
 require "#{PLUGIN_TOOL_ROOT_DIR}/lib/custom.rb"
+require "#{PLUGIN_TOOL_ROOT_DIR}/lib/i18n_extract_text.rb"
 require "#{PLUGIN_TOOL_ROOT_DIR}/lib/plugin_tool.rb"

data/lib/usage.txt

@@ -68,6 +68,10 @@ Commands:
     Enable or disable template debugging, including adding comments in generated HTML
     to indicate which templates were used.
 
+  i18n-debugging [disable]
+    Enable or disable internationalisation debugging, including indicating which text
+    in the user interface is translated.
+
   auth [SERVER]
     Authorise with server. SERVER can optionally include a non-default port number.
 
@@ -93,6 +97,10 @@ Commands:
   check
     Perform checks on the plugin as a quick test before it's submitted for review.
 
+  extract-text
+    Extract translatable text from templates, and attempt to extract text from JavaScript
+    files, and output a JSON data structure suitable for translation.
+
   license-key <application-id>
     Generate a license key to allow plugin installation by a client. The numeric
     application ID is displayed during plugin installation.

data/lib/version.txt

@@ -1 +1 @@
-ba15ef2
+861823a

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haplo
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.5.0
 platform: java
 authors:
 - Haplo Services
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-24 00:00:00.000000000 Z
+date: 2019-09-25 00:00:00.000000000 Z
 dependencies: []
 description: Development tools for developing Haplo plugins, see https://haplo.org
 email: client.services@haplo-services.com
@@ -27,6 +27,7 @@ files:
 - lib/haplo-templates.jar
 - lib/hmac.rb
 - lib/hsvt_parser_config.rb
+- lib/i18n_extract_text.rb
 - lib/js.jar
 - lib/js_min.js
 - lib/js_syntax_test.js