mc_translator 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80b8f221aa16654614846c559d380295c5ca71afbf18e306a18085c7e89b02d0
-  data.tar.gz: da07f2d730e9e6416020b8c37e96ef9667d55b8508aa40c6f9e17a3710e9bb1e
+  metadata.gz: 5b11d17165b5bdb48084e3e2140d08991d41e82f369cf38b094b989e9aad8e60
+  data.tar.gz: 3ac28107c299d525c26bd6b94bf1619cd2b74c59b4ac20124a84080719534571
 SHA512:
-  metadata.gz: 5b55587ec90167d6a9b65773876ffac48ade1b9522117f04bbd4fe3dee83d436277aa20fe187c9dafd0f9e0443311bad90a9ebd947bb1debbca313d87cd924b7
-  data.tar.gz: 10c0338b1024008272b6e2d457190b0ea5af9077f0387cb740216039be6d14ae85f38928a9465bd2c8405d797f13b1c1656552b98dde4d696a0d4ac13ae15d38
+  metadata.gz: 94235d4cb4bd896c59260b90629575f757f297de537f1e1c130e0d5b9844f75571fd765642ef8832bc49f7d4d63bb7c2c7c66997d3451efccf154ef5fbcf72ea
+  data.tar.gz: 90ff0afec54ab724a5a00abc1c198082ea522034f030fb8ddcae53de0d1c584ce17df5553ed07b1307102935df5ac33006d997e3982ba4b525891deeebc1d79e

data/README.md

@@ -25,13 +25,17 @@ Then, in your [Rakefile](https://github.com/yankaindustries/masterclass/blob/i18
 require 'mc_translator'
 ```
 
-Once you've got it installed, you'll need some basic configuration by adding a [.translations.yml](https://github.com/yankaindustries/masterclass/blob/i18n/mc_translator/.translator.yml):
+Once you've got it installed, you'll need some basic configuration by setting up some ENV vars and adding a [.translations.yml](https://github.com/yankaindustries/masterclass/blob/i18n/mc_translator/.translator.yml):
+
+```zsh
+# .env.development
+SMARTLING_USER_ID: xxxxxxxxxxxxxxxxxx
+SMARTLING_USER_SECRET: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+SMARTLING_PROJECT_ID: xxxxxxx
+```
 
 ```yaml
 # .translations.yml
-userId:     xxxxxxxxxxxxxxxxxx
-userSecret: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-projectId:  xxxxxxx
 locales:
   - en-GB
 matches:

data/lib/mc_translator/version.rb

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

data/lib/mc_translator.rb

@@ -51,8 +51,13 @@ module McTranslator
       YAML.safe_load(File.read('.translator.yml'))
     end
 
+    def project_root(path = '.')
+      root = config['projectRoot'] || '.'
+      File.expand_path(File.join(Dir.getwd, root, path))
+    end
+
     def git
-      Git.open(Dir.getwd)
+      Git.open(project_root('..'))
     end
 
     def origin
@@ -79,34 +84,32 @@ module McTranslator
 
     def all_files
       config['matches'].flat_map do |matcher|
-        Dir.glob(matcher['pattern']).map do |file|
+        Dir.glob(matcher['pattern'], base: config['projectRoot']).map do |file|
           { path: file, name: file, type: matcher['type'] }
         end
       end
     end
 
     def job_files
-      current_branch = git.current_branch
-
       print_msg 'Getting job and files...'
-      job = @jobs.list['items'].detect { |j| j['jobName'] == current_branch }
+      job = @jobs.list['items'].detect { |j| j['jobName'] == git.current_branch }
       @jobs.files(job['translationJobUid'])['items'].map do |file|
         { path: file['uri'], name: file['uri'] }
       end
     end
 
     def push(files)
-      current_branch = git.current_branch
-
       print_msg 'Setting up job...'
-      job = @jobs.find_or_create current_branch
+      job = @jobs.find_or_create git.current_branch
       p job['translationJobUid']
 
       print_msg 'Uploading files...'
       files.each do |file|
-        p file[:path]
         begin
-          @files.upload file[:path], file[:path], file[:type]
+          name = file[:path]
+          path = File.join(project_root, file[:path])
+          p name, path
+          @files.upload path, name, file[:type]
           @jobs.add_file job['translationJobUid'], file[:path], config['locales']
         rescue => error
           p error
@@ -121,41 +124,51 @@ module McTranslator
       job = @jobs.detail job['translationJobUid']
       p job['jobStatus']
 
-      if job['jobStatus'] == 'AWAITING_AUTHORIZATION'
-        print_msg 'Authorizing job...'
-        @jobs.authorize job["translationJobUid"]
-      end
+      # if job['jobStatus'] == 'AWAITING_AUTHORIZATION'
+      #   print_msg 'Authorizing job...'
+      #   @jobs.authorize job["translationJobUid"]
+      # end
 
       job
     end
 
     def pull(files)
       files
-        .map do |file| file[:path] end
+        .map { |file| file[:path] }
         .each do |file|
           config['locales'].each do |locale|
-            expansion = {
-              locale: locale,
-              dir: File.dirname(file),
-              name: File.basename(file, '.*').gsub(/en-US/, ''),
-              ext: File.extname(file),
-            }
-
-            name = File.expand_path(config['rewrite'] % expansion)
-            content = @files.download_translated(
-                        file,
-                        locale,
-                        { retrievalType: 'published' }
-                      )
-
-            p file
-            p name
-
-            dir = File.dirname(name)
-            Dir.mkdir(dir) unless Dir.exist?(dir)
-            File.write(name, content)
+            pull_with_locale(file, locale, locale, 'published')
           end
+
+          pull_with_locale(file, 'en-US', 'mc-US', 'pseudo')
         end
     end
+
+    def pull_with_locale(file, locale_on_smartling, locale_on_mc, type)
+      expansion = {
+        locale: locale_on_mc,
+        dir: File.dirname(file),
+        name: File.basename(file, '.*').gsub(/en-US/, ''),
+        ext: File.extname(file),
+      }
+
+      name = File.expand_path(config['rewrite'] % expansion)
+      content = @files.download_translated(
+        file,
+        locale_on_smartling,
+        retrievalType: type
+      )
+
+      p file
+      p name
+
+      if locale_on_smartling != locale_on_mc && /\.yml/ =~ name
+        content.sub!(Regexp.new(locale_on_smartling), locale_on_mc)
+      end
+
+      dir = File.dirname(name)
+      Dir.mkdir(dir) unless Dir.exist?(dir)
+      File.write(name, content)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mc_translator
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - justinjones53@gmail.com
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-21 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.0.3.1
 signing_key:
 specification_version: 4
 summary: Translates locale files