Merge pull request #547 from ooni/fix-metadata-locales

Fix metadata locales

Author: sdsantos

README.md

@@ -1,18 +1,3 @@
 /key.json
 /report.xml
 screenshots.html
-
-/metadata/android/*/images/phoneScreenshots/*.jpg
-/metadata/android/*/images/phoneScreenshots/*.png
-!/metadata/android/*/images/phoneScreenshots/1_*
-!/metadata/android/*/images/phoneScreenshots/2_*
-!/metadata/android/*/images/phoneScreenshots/3_*
-!/metadata/android/*/images/phoneScreenshots/4_*
-!/metadata/android/*/images/phoneScreenshots/5_*
-
-/metadata/dw/android/*/images/phoneScreenshots/*.png
-!/metadata/dw/android/*/images/phoneScreenshots/1_*
-!/metadata/dw/android/*/images/phoneScreenshots/2_*
-!/metadata/dw/android/*/images/phoneScreenshots/3_*
-!/metadata/dw/android/*/images/phoneScreenshots/4_*
-!/metadata/dw/android/*/images/phoneScreenshots/5_*

docs/Release.md

@@ -115,7 +115,7 @@ platform :android do
         organization = organization!(options)
         locales = locales_or_default(options)
 
-        # gradle(task: "clean copyBrandingToCommonResources assembleFullDebug assembleFullDebugAndroidTest -Porganization=#{organization}")
+        gradle(task: "clean copyBrandingToCommonResources assembleFullDebug assembleFullDebugAndroidTest -Porganization=#{organization}")
 
         enable_demo_mode
         capture_android_screenshots(
@@ -145,9 +145,9 @@ platform :android do
             skip_upload_apk: true,
             skip_upload_aab: true,
             skip_upload_changelogs: true,
-            skip_upload_images: options[:screenshots] || false,
-            skip_upload_metadata: options[:metadata] || false,
-            skip_upload_screenshots: false
+            skip_upload_images: true,
+            skip_upload_metadata: options[:metadata] != true && options[:metadata] != 'true',
+            skip_upload_screenshots: options[:screenshots] != true && options[:screenshots] != 'true',
         )
     end
 
@@ -265,10 +265,7 @@ def scheme!(organization)
 end
 
 def metadata_path(organization)
-    case organization
-    when "ooni" then "./fastlane/metadata/android"
-    when "dw" then "./fastlane/metadata/dw/android"
-    end
+    "./fastlane/metadata/#{organization}/android"
 end
 
 def package_name(organization, debug: false)

fastlane/.gitignore

@@ -0,0 +1 @@
+ooni/android

fastlane/Fastfile

@@ -0,0 +1 @@
+../../../../metadata/dw/android/am

fastlane/metadata/android

@@ -0,0 +1 @@
+../../../../metadata/dw/android/de