Merge branch 'trunk' into issue/16491-fix-percent-sign-localized

Author: RenanLukas

Gemfile.lock

@@ -13,20 +13,20 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.568.0)
-    aws-sdk-core (3.130.0)
+    aws-partitions (1.631.0)
+    aws-sdk-core (3.148.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.55.0)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.58.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.113.0)
+    aws-sdk-s3 (1.114.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.4.0)
+    aws-sigv4 (1.5.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     bigdecimal (1.4.4)
@@ -45,10 +45,10 @@ GEM
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.6)
+    dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.92.0)
-    faraday (1.10.1)
+    excon (0.92.4)
+    faraday (1.10.2)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -77,7 +77,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.6)
-    fastlane (2.205.0)
+    fastlane (2.210.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -116,7 +116,7 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
-    fastlane-plugin-wpmreleasetoolkit (5.4.0)
+    fastlane-plugin-wpmreleasetoolkit (5.5.0)
       activesupport (~> 5)
       bigdecimal (~> 1.4)
       buildkit (~> 1.5)
@@ -136,9 +136,9 @@ GEM
     git (1.12.0)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    google-apis-androidpublisher_v3 (0.16.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-core (0.7.0)
+    google-apis-androidpublisher_v3 (0.26.0)
+      google-apis-core (>= 0.7, < 2.a)
+    google-apis-core (0.8.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -149,17 +149,17 @@ GEM
       webrick
     google-apis-iamcredentials_v1 (0.13.0)
       google-apis-core (>= 0.7, < 2.a)
-    google-apis-playcustomapp_v1 (0.7.0)
-      google-apis-core (>= 0.4, < 2.a)
+    google-apis-playcustomapp_v1 (0.10.0)
+      google-apis-core (>= 0.7, < 2.a)
     google-apis-storage_v1 (0.17.0)
       google-apis-core (>= 0.7, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.2.0)
-    google-cloud-storage (1.38.0)
+    google-cloud-errors (1.3.0)
+    google-cloud-storage (1.41.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
@@ -175,17 +175,17 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.1)
-    json (2.6.1)
+    json (2.6.2)
     jsonlint (0.3.0)
       oj (~> 3)
       optimist (~> 3)
-    jwt (2.4.1)
+    jwt (2.5.0)
     memoist (0.16.2)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
@@ -201,7 +201,7 @@ GEM
     octokit (4.25.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
-    oj (3.13.20)
+    oj (3.13.21)
     optimist (3.0.1)
     options (2.3.2)
     optparse (0.1.1)
@@ -253,11 +253,11 @@ GEM
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8.1)
+    unf_ext (0.0.8.2)
     unicode-display_width (1.8.0)
     webrick (1.7.0)
     word_wrap (1.0.0)
-    xcodeproj (1.21.0)
+    xcodeproj (1.22.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)

RELEASE-NOTES.txt

@@ -1,5 +1,9 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 
+20.9
+-----
+
+
 20.8
 -----
 * [**] Stats: Always use Western Arabic numerals in Arabic languages (previously there was a mix of Eastern and Western Arabic numerals) [https://github.com/wordpress-mobile/WordPress-Android/pull/17160]

WordPress/jetpack_metadata/PlayStoreStrings.po

@@ -11,6 +11,14 @@ msgstr ""
 "Project-Id-Version: Jetpack - Apps - Android - Release Notes\n"
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
+msgctxt "release_note_208"
+msgid ""
+"20.8:\n"
+"We added dynamic widgets to show at-a-glance, all-time, and daily stats on user devices’ home screens.\n"
+"Users on multi-author sites can change content authors in post and page settings.\n"
+"Arabic language users will see numerals on Stats screens exclusively in Western Arabic numbers.\n"
+msgstr ""
+
 msgctxt "release_note_207"
 msgid ""
 "20.7:\n"
@@ -20,13 +28,6 @@ msgid ""
 "- Certain elements of the editor and post settings are now WordPress blue\n"
 msgstr ""
 
-msgctxt "release_note_206"
-msgid ""
-"20.6:\n"
-"- You can now log in to the app using an email address that contains a special character.\n"
-"- Preloading themes no longer crash the app during Site Creation. Whew.\n"
-msgstr ""
-
 #. translators: Title to be displayed in the Play Store. Limit to 30 characters including spaces and commas!
 msgctxt "play_store_app_title"
 msgid "Jetpack – Website Builder"

WordPress/jetpack_metadata/release_notes.txt

@@ -1,4 +1,3 @@
-- Jetpack widgets are now available on your device’s home screen
-- Media preview controls are visible in both light and dark mode
-- Compose theme’s Login Code screen has better color contrast
-- Certain elements of the editor and post settings are now WordPress blue
+We added dynamic widgets to show at-a-glance, all-time, and daily stats on user devices’ home screens.
+Users on multi-author sites can change content authors in post and page settings.
+Arabic language users will see numerals on Stats screens exclusively in Western Arabic numbers.

WordPress/metadata/PlayStoreStrings.po

@@ -11,6 +11,13 @@ msgstr ""
 "Project-Id-Version: Release Notes & Play Store Descriptions\n"
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
+msgctxt "release_note_208"
+msgid ""
+"20.8:\n"
+"Users on multi-author sites can change content authors in post and page settings.\n"
+"Arabic language users will now see numerals on Stats screens exclusively in Western Arabic numbers—no more mix and match with Eastern Arabic numbers.\n"
+msgstr ""
+
 msgctxt "release_note_207"
 msgid ""
 "20.7:\n"
@@ -19,14 +26,6 @@ msgid ""
 "The Login Code screen in the Compose theme also has better color contrast for more readable text. Shiny.\n"
 msgstr ""
 
-msgctxt "release_note_206"
-msgid ""
-"20.6:\n"
-"- You can now log in to the app using an email address that contains a special character.\n"
-"- Preloading themes no longer crash the app during Site Creation. Whew.\n"
-"- Power up—the Jetpack Powered banner is shown in lists of search results.\n"
-msgstr ""
-
 #. translators: Shorter Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
 msgctxt "sample_post_content"
 msgid "The best moment of any trip, for me, is when I first step foot off the plane. The whole of the trip is in front me, ripe with possibility."

WordPress/metadata/release_notes.txt

@@ -1,3 +1,2 @@
-We can see clearly now—media preview controls (like the back button) are now visible in both light and dark mode.
-
-The Login Code screen in the Compose theme also has better color contrast for more readable text. Shiny.
+Users on multi-author sites can change content authors in post and page settings.
+Arabic language users will now see numerals on Stats screens exclusively in Western Arabic numbers—no more mix and match with Eastern Arabic numbers.

WordPress/src/jetpack/res/values/strings.xml

@@ -29,4 +29,7 @@
 
     <!-- My Site Initial Tab Default value -->
     <string name="initial_screen_entry_value_default_key" translatable="false">@string/initial_screen_entry_value_home</string>
+
+    <!-- Share button in Me -->
+    <string name="me_btn_share">Share Jetpack with a friend</string>
 </resources>

WordPress/src/main/java/org/wordpress/android/ui/bloggingprompts/onboarding/BloggingPromptsOnboardingUiStateMapper.kt

@@ -27,7 +27,9 @@ class BloggingPromptsOnboardingUiStateMapper @Inject constructor() {
         )
 
         val trailingLabel = UiStringPluralRes(
-                R.plurals.my_site_blogging_prompt_card_number_of_answers,
+                0,
+                R.string.my_site_blogging_prompt_card_number_of_answers_one,
+                R.string.my_site_blogging_prompt_card_number_of_answers_other,
                 dummyRespondents.size
         )
 

WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.kt

@@ -126,7 +126,7 @@ class MeFragment : Fragment(R.layout.me_fragment), OnScrollToTopListener {
                 setTitle(packageManager.getActivityInfo(componentName, PackageManager.GET_META_DATA).labelRes)
             }
         }
-        
+
         if (jetpackBrandingUtils.shouldShowJetpackBranding()) {
             jetpackBadge.isVisible = true
             if (jetpackBrandingUtils.shouldShowJetpackPoweredBottomSheet()) {
@@ -244,8 +244,7 @@ class MeFragment : Fragment(R.layout.me_fragment), OnScrollToTopListener {
     }
 
     private fun MeFragmentBinding.initRecommendUiState() {
-        // Limiting the feature to WordPress only in this v1
-        if (recommendTheAppFeatureConfig.isEnabled() && !BuildConfig.IS_JETPACK_APP) {
+        if (recommendTheAppFeatureConfig.isEnabled()) {
             setRecommendLoadingState(false)
             recommendTheAppContainer.visibility = View.VISIBLE
             rowRecommendTheApp.setOnClickListener {

WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/bloggingprompts/BloggingPromptCardBuilder.kt

@@ -13,7 +13,9 @@ import javax.inject.Inject
 class BloggingPromptCardBuilder @Inject constructor() {
     fun build(params: BloggingPromptCardBuilderParams) = params.bloggingPrompt?.let {
         val trailingLabel = UiStringPluralRes(
-                R.plurals.my_site_blogging_prompt_card_number_of_answers,
+                0,
+                R.string.my_site_blogging_prompt_card_number_of_answers_one,
+                R.string.my_site_blogging_prompt_card_number_of_answers_other,
                 params.bloggingPrompt.respondentsCount
         )