Merge branch 'trunk' into feature/author-button-to-post-settings

Author: irfano

.buildkite/commands/release-build.sh

@@ -7,7 +7,7 @@ echo "--- :closed_lock_with_key: Installing Secrets"
 bundle exec fastlane run configure_apply
 
 echo "--- :hammer_and_wrench: Building"
-bundle exec fastlane build_and_upload_release app:$1 skip_confirm:true skip_prechecks:true upload_to_play_store:true
+bundle exec fastlane build_and_upload_release app:$1 skip_confirm:true skip_prechecks:true
 
 echo "--- 💾 Saving Artifact"
 for aab in build/*.aab; do

RELEASE-NOTES.txt

@@ -1,15 +1,14 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 
 20.8
-----
+-----
 * [**] Added author button to the post settings and the author of the post can be changed with it. [https://github.com/wordpress-mobile/WordPress-Android/pull/17120]
 
 20.7
 -----
 * [*] Fixes Media control toggles difficult to see [https://github.com/wordpress-mobile/WordPress-Android/pull/17068]
 * [*] Fix night mode text colors on the screens shown after scanning a Login Code [https://github.com/wordpress-mobile/WordPress-Android/pull/17086]
 * [***] Jetpack App: Widgets are now on Jetpack. Long press on app icon to find and add widgets to home screen. [https://github.com/wordpress-mobile/WordPress-Android/pull/17100]
-* [*] [Jetpack-only] Block Editor: Makes some small changes to the editor's accent colours for consistency. [#16968]
 * [*] [Jetpack-only] Block Editor: Makes some small changes to the editor's accent colours for consistency. [https://github.com/wordpress-mobile/WordPress-Android/pull/16968]
 
 20.6

WordPress/jetpack_metadata/PlayStoreStrings.po

@@ -11,21 +11,22 @@ 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_207"
+msgid ""
+"20.7:\n"
+"- Jetpack widgets are now available on your device’s home screen\n"
+"- Media preview controls are visible in both light and dark mode\n"
+"- Compose theme’s Login Code screen has better color contrast\n"
+"- 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 ""
 
-msgctxt "release_note_205"
-msgid ""
-"20.5:\n"
-"- We added a label in App Settings to show the app’s current interface language.\n"
-"- We bumped up the screenshot size in the site theme picker to go with high-resolution image previews.\n"
-"- In the site creation process, we changed the Skip button text from blue to Jetpack green.\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,2 +1,4 @@
-- You can now log in to the app using an email address that contains a special character.
-- Preloading themes no longer crash the app during Site Creation. Whew.
+- 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

WordPress/metadata/PlayStoreStrings.po

@@ -11,6 +11,14 @@ 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_207"
+msgid ""
+"20.7:\n"
+"We can see clearly now—media preview controls (like the back button) are now visible in both light and dark mode.\n"
+"\n"
+"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"
@@ -19,13 +27,6 @@ msgid ""
 "- Power up—the Jetpack Powered banner is shown in lists of search results.\n"
 msgstr ""
 
-msgctxt "release_note_205"
-msgid ""
-"20.5:\n"
-"- We added a new label in App Settings to show the app’s current interface language. Shiny.\n"
-"- Now that the app supports higher-resolution image previews, we bumped up the size of theme screenshots in the site theme picker. No more pixellation, only pixel perfection.\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."
@@ -53,9 +54,6 @@ msgid "Easily build your website & blog. Create posts & track analytics from any
 msgstr ""
 
 #. translators: Multi-paragraph text used to display in the Play Store. Limit to 4000 characters including spaces and commas!
-#. Tip: You might use the previous translation of the old copy, that you can find in the translation memory of `play_store_desc_old_copy_do_not_translate`,
-#. as a starting point to translate this new copy, since this new copy is very similar to the old one, with only a couple of sentences/paragraphs removed.
-#. See https://github.com/wordpress-mobile/WordPress-Android/pull/17069/files#diff-627fbef511dc257b5ecf6b9029883b713870ff46a6327c7050bfb82d7af27c03 for the diff.
 msgctxt "play_store_desc"
 msgid ""
 "WordPress for Android puts the power of web publishing in your pocket. It’s a website creator and so much more!\n"
@@ -100,59 +98,6 @@ msgid ""
 "California users privacy notice: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa.\n"
 msgstr ""
 
-#. translators: Warning: this is the OLD copy for the `play_store_desc` key. It is not used anymore, so strictly speaking, does not need to be translated in practice.
-#. This old source will only be kept around for a short time, the only goal being to keep the "translation memory" for this old copy around, to help while the new copy is translated (since the shorter, new copy has many common paragraphs with the old one here).
-#. The diff between the source of the old copy (this one) and the new one (in `play_store_desc`) can be seen in https://github.com/wordpress-mobile/WordPress-Android/pull/17069/files#diff-627fbef511dc257b5ecf6b9029883b713870ff46a6327c7050bfb82d7af27c03
-#. This key for the old copy will be removed once the new copy have translations for all locales in this project.
-msgctxt "play_store_desc_old_copy_do_not_translate"
-msgid ""
-"WordPress for Android puts the power of web publishing in your pocket. It’s a website creator and so much more!\n"
-"\n"
-"CREATE\n"
-"- Give your big ideas a home on the web. WordPress for Android is a website builder and a blog maker. Use it to create your website.\n"
-"- Pick the right look and feel from a wide selection of WordPress themes, then customize with photos, colors, and fonts so it’s uniquely you.\n"
-"- Built-in Quick Start tips guide you through the setup basics to set your new website up for success. (We’re not just a website creator -- we’re your partner and cheering squad!)\n"
-"\n"
-"STATS\n"
-"- Check your website’s stats in real time to keep track of the activity on your site.\n"
-"- Track which posts and pages get the most traffic over time by exploring daily, weekly, monthly, and yearly insights.\n"
-"- Use the traffic map to see which countries your visitors come from.\n"
-"\n"
-"NOTIFICATIONS\n"
-"- Get notifications about comments, likes, and new followers so you can see people reacting to your website as it happens.\n"
-"- Reply to new comments as they show up to keep the conversation flowing and acknowledge your readers.\n"
-"\n"
-"PUBLISH\n"
-"- Create updates, stories, photo essays announcements -- anything! --  with the editor.\n"
-"- Bring your posts and pages to life with photos and video from your camera and albums, or find the perfect image with the in-app collection of free-to-use pro photography.\n"
-"- Save ideas as drafts and come back to them when your muse returns, or schedule new posts for the future so your site is always fresh and engaging.\n"
-"- Add tags and categories to help new readers discover your posts, and watch your audience grow.\n"
-"\n"
-"READER\n"
-"- WordPress is more than a blog maker — use it to connect with a community of writers in the WordPress Reader. Explore thousands of topics by tag, discover new authors and organizations, and follow the ones who pique your interest.\n"
-"- Hang on to the posts that fascinate you with the Save for later feature.\n"
-"\n"
-"SHARE\n"
-"- Set up automated sharing to tell your followers on social media when you publish a new post. Automatically cross-post to Facebook, Twitter, and more.\n"
-"- Add social sharing buttons to your posts so your visitors can share them with their network, and let your fans become your ambassadors.\n"
-"\n"
-"Why WordPress?\n"
-"\n"
-"There are a lot of blogging services, website builders, and social networks out there. Why create your website with WordPress?\n"
-"\n"
-"WordPress powers over a third of the web. It’s used by hobby blogs, businesses of all sizes, online stores, even the biggest news sites on the internet. Odds are that many of your favorite websites are running on WordPress.\n"
-"\n"
-"With WordPress, you own your own content.  Other social networks treat you as a commodity, and assume ownership of the content you post. But with WordPress anything you publish is yours, and you can take it with you wherever you’d like.\n"
-"\n"
-"WordPress is an open source website creator, meaning anyone can see how it's made, and even contribute.  Other services and social networks are proprietary, closed systems; you can never be sure exactly how they work or what they are doing -- and they can disappear!\n"
-"\n"
-"Whether you need a website builder to create your website, or a simple blog maker, WordPress can help. It gives you beautiful designs, powerful features, and the freedom to build anything you want.\n"
-"\n"
-"WordPress for Android supports self-hosted sites running WordPress 4.0 and later, and all sites at WordPress.com. Just like WordPress, WordPress for Android is open source. Learn more at  https://wp.me/P7jrAc-tJ.  Need help with the app? Send us a tweet at @WPAndroid, or visit our forums at https://android.forums.wordpress.org/forum/troubleshooting.\n"
-"\n"
-"California users privacy notice: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa.\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 "WordPress – Website Builder"

WordPress/metadata/release_notes.txt

@@ -1,3 +1,3 @@
-- You can now log in to the app using an email address that contains a special character.
-- Preloading themes no longer crash the app during Site Creation. Whew.
-- Power up—the Jetpack Powered banner is shown in lists of search results.
+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.

WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteFragment.kt

@@ -94,6 +94,7 @@ class MySiteFragment : Fragment(R.layout.my_site_fragment),
             toolbar.inflateMenu(R.menu.my_site_menu)
             toolbar.menu.findItem(R.id.me_item)?.let { meMenu ->
                 meMenu.actionView.let { actionView ->
+                    actionView.contentDescription = meMenu.title
                     actionView.setOnClickListener { viewModel.onAvatarPressed() }
                     TooltipCompat.setTooltipText(actionView, meMenu.title)
                 }

WordPress/src/main/res/values-ar/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2022-08-24 17:54:08+0000
+Translation-Revision-Date: 2022-09-02 08:08:43+0000
 Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ((n == 1) ? 1 : ((n == 2) ? 2 : ((n % 100 >= 3 && n % 100 <= 10) ? 3 : ((n % 100 >= 11 && n % 100 <= 99) ? 4 : 5))));
 Generator: GlotPress/4.0.0-alpha.1
 Language: ar
@@ -2462,6 +2462,7 @@ Language: ar
     <string name="requesting_otp">طلب رمز تحقق عن طريق رسالة نصية قصيرة (SMS).</string>
     <string name="login_text_otp">أرسل إليّ رمزًا بدلاً من ذلك.</string>
     <string name="enter_verification_code">تقريبًا هناك! يرجى إدخال رمز التحقق من تطبيق الموثق الخاص بك.</string>
+    <string name="open_mail">فتح البريد</string>
     <string name="next">التالي</string>
     <string name="enter_email_wordpress_com">سجِّل الدخول إلى WordPress.com باستخدام عنوان بريد إلكتروني لإدارة جميع مواقع ووردبريس الخاصة بك.</string>
     <string name="image_optimization_promo_desc">يقلل تحسين الصورة حجم الصور لتحميلها بسرعة.\n\nيمكنك تغيير هذا في أي وقت في إعدادات الموقع.</string>