Release 1.0.15

koral-- · Jan 4, 2019 · 89c7c9c · 89c7c9c
1 parent 8ae6af2
commit 89c7c9c
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.0.15
+- added support for empty plural values
+- dependencies versions bump
+
 ### 1.0.14
 - fixed `IF_TAGS_ABSENT` tag escaping strategy
 

diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ Generation has to be invoked as additional gradle task. Java 1.8 is required.
 In whichever `build.gradle` file.
 ```groovy
 plugins {
-  id 'pl.droidsonroids.localization' version '1.0.14'
+  id 'pl.droidsonroids.localization' version '1.0.15'
 }
 ```
 Note: exact version number must be specified, `+` cannot be used as wildcard.
@@ -40,7 +40,7 @@ Note: exact version number must be specified, `+` cannot be used as wildcard.
      }
      dependencies {
          classpath 'com.android.tools.build:gradle:3.2.1'
-         classpath 'pl.droidsonroids.gradle.localization:android-gradle-localization-plugin:1.0.14'
+         classpath 'pl.droidsonroids.gradle.localization:android-gradle-localization-plugin:1.0.15'
      }
  }
  ```

diff --git a/build.gradle b/build.gradle
@@ -23,7 +23,7 @@ repositories {
 
 dependencies {
     implementation gradleApi()
-    implementation 'org.codehaus.groovy:groovy:2.5.4'
+    implementation 'org.codehaus.groovy:groovy:2.5.5'
     implementation 'org.marketcetera.fork:commons-csv:3.0.12'
     implementation 'org.apache.poi:poi-ooxml-schemas:4.0.1'
     implementation 'org.apache.poi:poi-ooxml:4.0.1'

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/groovy/pl/droidsonroids/gradle/localization/ParserEngine.groovy b/src/main/groovy/pl/droidsonroids/gradle/localization/ParserEngine.groovy
@@ -146,7 +146,7 @@ class ParserEngine {
                             continue
                         if (mConfig.handleEmptyTranslationsAsDefault && builder.mQualifier != mConfig.defaultColumnName)
                             continue
-                        if (!mConfig.allowEmptyTranslations)
+                        if (!mConfig.allowEmptyTranslations && resourceType != PLURAL)
                             throw new IllegalArgumentException("$name is not translated to locale $builder.mQualifier, row #${i + 1}")
                     } else {
                         if (!translatable && !mConfig.allowNonTranslatableTranslation && builder.mQualifier != mConfig.defaultColumnName)

diff --git a/src/test/resources/pl/droidsonroids/gradle/localization/valid.csv b/src/test/resources/pl/droidsonroids/gradle/localization/valid.csv
@@ -3,7 +3,8 @@ app         ,Application, ,,false
 cow[one]  ,cow      ,krowa
 file        ,File       ,"Plik"     ,file label ,
 days[],monday,,,false
-cow[other],cows     ,krowy,comment
+cow[few],,krowy,comment
+cow[other],cows,krów,comment
 days[],tuesday,,,
 days[],wednesday,,,