ad_localize 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1a18c57ba71812f3a373cb5b5904b784cf2855f444b1cf979a6c854db3d585b
-  data.tar.gz: aa1199ab974d906eb9b3bad2b319601709251632e42d13965dded74fa4a9384e
+  metadata.gz: 1971516fa956f4228c8a1c7e8d3b06e635ef6a6e609d784af4596d3d84761d1c
+  data.tar.gz: 63b3fd447704657f10b76485710ceb75a5b945b92b8c40eb5f3c16e5466b381b
 SHA512:
-  metadata.gz: 3b7c19e962e871d0248443ba4a64f53a4f7a4348c63cbee07fabdeb2e020d97a8f9d6ae3beff1e46f89347c252615510c003b8cec30c96f93dde9c938e786374
-  data.tar.gz: 12eaeeded22193ea3c0e5e6a6fc5c4bf9faece87cb4c33811452b0bfa44bb73ca448c3665a26930d824acf724701c85e7e49a045974ca9d470c4da4c1d226051
+  metadata.gz: 7e34444bd5440e40fd667b6a904c6871382bffc74461011801e120dd95380c256b42f4ed61dc740695805819abe137294b5071446a158e82e27090fa747c7a19
+  data.tar.gz: a062eac8f10ba7f2e3a85d88ee9f02c5f9b1c8fde4de560155c517e69b63010da6d7113c14f18c7e635a0831839ae0a66aacd74ba756ff8c6c5b1d813c892e8a

data/CHANGELOG.md

@@ -5,13 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.1.1] - 2022-04-15
+
+### Fixed
+
+- Fix an issue with percent export in PR [#74](https://github.com/faberNovel/ad_localize/pull/74)
+
 ## [4.1.0] - 2022-03-02
 
 ### Changed
 
 - Do not export empty translation on Android in PR [#72](https://github.com/faberNovel/ad_localize/pull/72)
 
-
 ## [4.0.9] - 2021-09-05
 
 ### Fixed

data/Gemfile.lock

@@ -11,7 +11,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.6)
+    activesupport (6.1.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)

data/lib/ad_localize/mappers/android_translation_mapper.rb

@@ -9,9 +9,17 @@ module AdLocalize
         processedValue = processedValue.gsub(/(?<!\\)\"/, '&#34;') # match " unless there is a \ before
         processedValue = processedValue.gsub(">", '&gt;')
         processedValue = processedValue.gsub("<", '&lt;')
+        hasFormatting = processedValue.match(/(%(\d+\$)?@)/)
         processedValue = processedValue.gsub(/(%(\d+\$)?@)/, '%\2s') # should match values like %1$s and %s
+        hasFormatting = hasFormatting || processedValue.match(/(%((\d+\$)?(\d+)?)i)/)
         processedValue = processedValue.gsub(/(%((\d+\$)?(\d+)?)i)/, '%\2d') # should match values like %i, %3$i, %01i, %1$02i
-        processedValue = processedValue.gsub(/%(?!((\d+\$)?(s|(\d+)?d)))/, '&#37;') # negative lookahead: identifies when user really wants to display a %
+        # On Android, '%' must be escaped with a second '%' if and only if the string has at least one formatting pattern. In this specific case, 
+        # a Java formatting method will be used which interprets every non escaped '%' as the start of a formatting pattern.
+        if hasFormatting 
+          processedValue = processedValue.gsub(/%(?!((\d+\$)?(s|(\d+)?d)))/, '%%') # negative lookahead: identifies when user really wants to display a %
+        else
+          processedValue = processedValue.gsub(/%(?!((\d+\$)?(s|(\d+)?d)))/, '%') # negative lookahead: identifies when user really wants to display a %
+        end
         processedValue = processedValue.gsub("\\U", "\\u")
         processedValue = processedValue.gsub(/&(?!((#\d+)|(\w+));)/, '&#38;')
         processedValue = processedValue.gsub(/&/) { |match| match.replace('\&') }

data/lib/ad_localize/version.rb

@@ -1,3 +1,3 @@
 module AdLocalize
-  VERSION = "4.1.0"
+  VERSION = "4.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ad_localize
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Edouard Siegel
@@ -17,7 +17,7 @@ authors:
 - Claire Dufetrelle
 - Pierre Felgines
 - Satyan Jacquens
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
 date: 2018-04-18 00:00:00.000000000 Z
@@ -270,7 +270,7 @@ homepage: https://github.com/applidium/ad_localize
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -285,8 +285,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key:
+rubygems_version: 3.2.26
+signing_key: 
 specification_version: 4
 summary: AdLocalize helps with mobile and web applications wording
 test_files: []