Skip to content

Commit ed86ac6

Browse files
wpmobilebotadalpariiangmaia
authored
Merge release/26.3 into trunk (#22293)
* Debug: adding logs for gravatar loading issue (#22289) * Adding logs for Gravatar loading issue * style * Update release-toolkit to fix GlotPress translation download issue (#22292) * Update translations * Update WordPress metadata translations for 26.3 * Update Jetpack metadata translations for 26.3 * Bump version number --------- Co-authored-by: Adalberto Plaza <adalpari@gmail.com> Co-authored-by: Ian G. Maia <iangmaia@users.noreply.github.com>
1 parent e07c5d3 commit ed86ac6

File tree

88 files changed

+2005
-1365
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+2005
-1365
lines changed

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ gem 'nokogiri'
99
### Fastlane Plugins
1010

1111
gem 'fastlane-plugin-sentry'
12-
gem 'fastlane-plugin-wpmreleasetoolkit', '~> 12.3'
12+
gem 'fastlane-plugin-wpmreleasetoolkit', '~> 13.5'
1313
# gem 'fastlane-plugin-wpmreleasetoolkit', path: '../../release-toolkit'
1414
# gem 'fastlane-plugin-wpmreleasetoolkit', git: 'https://github.com/wordpress-mobile/release-toolkit', branch: ''
1515

‎Gemfile.lock‎

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ GEM
55
base64
66
nkf
77
rexml
8-
activesupport (8.0.2)
8+
activesupport (8.0.3)
99
base64
1010
benchmark (>= 0.3)
1111
bigdecimal
@@ -23,28 +23,29 @@ GEM
2323
artifactory (3.0.17)
2424
ast (2.4.3)
2525
atomos (0.1.3)
26-
aws-eventstream (1.3.2)
27-
aws-partitions (1.1099.0)
28-
aws-sdk-core (3.223.0)
26+
aws-eventstream (1.4.0)
27+
aws-partitions (1.1174.0)
28+
aws-sdk-core (3.233.0)
2929
aws-eventstream (~> 1, >= 1.3.0)
3030
aws-partitions (~> 1, >= 1.992.0)
3131
aws-sigv4 (~> 1.9)
3232
base64
33+
bigdecimal
3334
jmespath (~> 1, >= 1.6.1)
3435
logger
35-
aws-sdk-kms (1.100.0)
36-
aws-sdk-core (~> 3, >= 3.216.0)
36+
aws-sdk-kms (1.114.0)
37+
aws-sdk-core (~> 3, >= 3.231.0)
3738
aws-sigv4 (~> 1.5)
38-
aws-sdk-s3 (1.185.0)
39-
aws-sdk-core (~> 3, >= 3.216.0)
39+
aws-sdk-s3 (1.200.0)
40+
aws-sdk-core (~> 3, >= 3.231.0)
4041
aws-sdk-kms (~> 1)
4142
aws-sigv4 (~> 1.5)
42-
aws-sigv4 (1.11.0)
43+
aws-sigv4 (1.12.1)
4344
aws-eventstream (~> 1, >= 1.0.2)
4445
babosa (1.0.4)
45-
base64 (0.2.0)
46-
benchmark (0.4.0)
47-
bigdecimal (3.1.9)
46+
base64 (0.3.0)
47+
benchmark (0.4.1)
48+
bigdecimal (3.3.1)
4849
buildkit (1.6.1)
4950
sawyer (>= 0.6)
5051
chroma (0.2.0)
@@ -58,7 +59,7 @@ GEM
5859
commander (4.6.0)
5960
highline (~> 2.0.0)
6061
concurrent-ruby (1.3.5)
61-
connection_pool (2.5.3)
62+
connection_pool (2.5.4)
6263
cork (0.3.0)
6364
colored2 (~> 3.1)
6465
danger (9.5.1)
@@ -86,12 +87,12 @@ GEM
8687
danger
8788
rubocop (~> 1.0)
8889
declarative (0.0.20)
89-
diffy (3.4.3)
90+
diffy (3.4.4)
9091
digest-crc (0.7.0)
9192
rake (>= 12.0.0, < 14.0.0)
9293
domain_name (0.6.20240107)
9394
dotenv (2.8.1)
94-
drb (2.2.1)
95+
drb (2.2.3)
9596
emoji_regex (3.2.3)
9697
excon (0.112.0)
9798
faraday (1.10.4)
@@ -110,12 +111,12 @@ GEM
110111
faraday (>= 0.8.0)
111112
http-cookie (~> 1.0.0)
112113
faraday-em_http (1.0.0)
113-
faraday-em_synchrony (1.0.0)
114+
faraday-em_synchrony (1.0.1)
114115
faraday-excon (1.1.0)
115116
faraday-http-cache (2.5.1)
116117
faraday (>= 0.8)
117118
faraday-httpclient (1.0.1)
118-
faraday-multipart (1.1.0)
119+
faraday-multipart (1.1.1)
119120
multipart-post (~> 2.0)
120121
faraday-net_http (1.0.2)
121122
faraday-net_http_persistent (1.2.0)
@@ -125,7 +126,7 @@ GEM
125126
faraday_middleware (1.2.1)
126127
faraday (~> 1.0)
127128
fastimage (2.4.0)
128-
fastlane (2.227.2)
129+
fastlane (2.228.0)
129130
CFPropertyList (>= 2.3, < 4.0.0)
130131
addressable (>= 2.8, < 3.0.0)
131132
artifactory (~> 3.0)
@@ -169,7 +170,7 @@ GEM
169170
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
170171
fastlane-plugin-sentry (1.29.0)
171172
os (~> 1.1, >= 1.1.4)
172-
fastlane-plugin-wpmreleasetoolkit (12.5.0)
173+
fastlane-plugin-wpmreleasetoolkit (13.5.3)
173174
activesupport (>= 6.1.7.1)
174175
buildkit (~> 1.5)
175176
chroma (= 0.2.0)
@@ -237,8 +238,8 @@ GEM
237238
concurrent-ruby (~> 1.0)
238239
java-properties (0.3.0)
239240
jmespath (1.6.2)
240-
json (2.11.3)
241-
jwt (2.10.1)
241+
json (2.15.1)
242+
jwt (2.10.2)
242243
base64
243244
kramdown (2.5.1)
244245
rexml (>= 3.3.9)
@@ -250,15 +251,15 @@ GEM
250251
mini_magick (4.13.2)
251252
mini_mime (1.1.5)
252253
mini_portile2 (2.8.9)
253-
minitest (5.25.5)
254-
multi_json (1.15.0)
254+
minitest (5.26.0)
255+
multi_json (1.17.0)
255256
multipart-post (2.4.1)
256257
mutex_m (0.3.0)
257258
nanaimo (0.4.0)
258259
nap (1.1.0)
259-
naturally (2.2.1)
260+
naturally (2.3.0)
260261
nkf (0.2.0)
261-
nokogiri (1.18.9)
262+
nokogiri (1.18.10)
262263
mini_portile2 (~> 2.8.2)
263264
racc (~> 1.4)
264265
octokit (6.1.1)
@@ -281,17 +282,17 @@ GEM
281282
public_suffix (6.0.2)
282283
racc (1.8.1)
283284
rainbow (3.1.1)
284-
rake (13.2.1)
285+
rake (13.3.0)
285286
rake-compiler (1.3.0)
286287
rake
287-
rchardet (1.9.0)
288+
rchardet (1.10.0)
288289
regexp_parser (2.10.0)
289290
representable (3.2.0)
290291
declarative (< 0.1.0)
291292
trailblazer-option (>= 0.1.1, < 0.2.0)
292293
uber (< 0.2.0)
293294
retriable (3.1.2)
294-
rexml (3.4.1)
295+
rexml (3.4.4)
295296
rmagick (4.3.0)
296297
rouge (3.28.0)
297298
rubocop (1.75.5)
@@ -316,10 +317,10 @@ GEM
316317
faraday (>= 0.17.3, < 3)
317318
securerandom (0.4.1)
318319
security (0.1.5)
319-
signet (0.20.0)
320+
signet (0.21.0)
320321
addressable (~> 2.8)
321322
faraday (>= 0.17.5, < 3.a)
322-
jwt (>= 1.5, < 3.0)
323+
jwt (>= 1.5, < 4.0)
323324
multi_json (~> 1.10)
324325
simctl (1.6.10)
325326
CFPropertyList
@@ -337,7 +338,7 @@ GEM
337338
concurrent-ruby (~> 1.0)
338339
uber (0.1.0)
339340
unicode-display_width (2.6.0)
340-
uri (1.0.3)
341+
uri (1.0.4)
341342
word_wrap (1.0.0)
342343
xcodeproj (1.27.0)
343344
CFPropertyList (>= 2.3.3, < 4.0)
@@ -358,7 +359,7 @@ DEPENDENCIES
358359
danger-dangermattic (~> 1.2)
359360
fastlane (~> 2)
360361
fastlane-plugin-sentry
361-
fastlane-plugin-wpmreleasetoolkit (~> 12.3)
362+
fastlane-plugin-wpmreleasetoolkit (~> 13.5)
362363
nokogiri
363364
rmagick (~> 4.1)
364365

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

Lines changed: 42 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ import org.wordpress.android.fluxc.store.AccountStore
4343
import org.wordpress.android.fluxc.store.AccountStore.OnAccountChanged
4444
import org.wordpress.android.fluxc.store.PostStore
4545
import org.wordpress.android.fluxc.store.SiteStore
46+
import org.wordpress.android.fluxc.utils.AppLogWrapper
4647
import org.wordpress.android.models.JetpackPoweredScreen
4748
import org.wordpress.android.ui.ActivityLauncher
4849
import org.wordpress.android.ui.about.UnifiedAboutActivity
@@ -135,6 +136,9 @@ class MeFragment : Fragment(R.layout.me_fragment), OnScrollToTopListener {
135136
@Inject
136137
lateinit var experimentalFeatures: ExperimentalFeatures
137138

139+
@Inject
140+
lateinit var appLogWrapper: AppLogWrapper
141+
138142
private val viewModel: MeViewModel by viewModels()
139143
private val emailVerificationViewModel: EmailVerificationViewModel by viewModels()
140144

@@ -241,58 +245,71 @@ class MeFragment : Fragment(R.layout.me_fragment), OnScrollToTopListener {
241245
}
242246

243247
private fun MeFragmentBinding.showAvatarPicker() {
248+
appLogWrapper.d(AppLog.T.MAIN, "Gravatar: Opening avatar editor")
244249
withVeryfiedEmail(unverifiedEmailMessageRes = R.string.avatar_update_email_unverified) {
245250
showQuickEditor(page = AvatarPickerAndAboutEditorConfiguration.Page.AvatarPicker)
246251
}
247252
}
248253

249254
private fun MeFragmentBinding.showProfileEditor() {
255+
appLogWrapper.d(AppLog.T.MAIN, "Gravatar: Opening profile editor")
250256
withVeryfiedEmail(unverifiedEmailMessageRes = R.string.about_update_email_unverified) {
251257
showQuickEditor(page = AvatarPickerAndAboutEditorConfiguration.Page.AboutEditor)
252258
}
253259
}
254260

261+
@Suppress("TooGenericExceptionCaught")
255262
private fun MeFragmentBinding.showQuickEditor(
256263
page: AvatarPickerAndAboutEditorConfiguration.Page
257264
) {
258-
GravatarQuickEditor.show(
259-
fragment = this@MeFragment,
260-
gravatarQuickEditorParams = GravatarQuickEditorParams {
261-
email = Email(accountStore.account.email)
262-
scopeOption = QuickEditorScopeOption.avatarAndAbout {
263-
initialPage = page
264-
fields = setOf(
265-
AboutInputField.FirstName,
266-
AboutInputField.LastName,
267-
AboutInputField.DisplayName,
268-
AboutInputField.AboutMe
269-
)
270-
}
271-
},
272-
authenticationMethod = AuthenticationMethod.Bearer(accountStore.accessToken.orEmpty()),
273-
updateHandler = { event ->
274-
when (event) {
275-
AvatarPickerResult -> {
276-
loadAvatar(null, true)
265+
try {
266+
appLogWrapper.d(AppLog.T.MAIN, "Gravatar: Showing Gravatar quick editor: ${page.value}")
267+
GravatarQuickEditor.show(
268+
fragment = this@MeFragment,
269+
gravatarQuickEditorParams = GravatarQuickEditorParams {
270+
email = Email(accountStore.account.email)
271+
scopeOption = QuickEditorScopeOption.avatarAndAbout {
272+
initialPage = page
273+
fields = setOf(
274+
AboutInputField.FirstName,
275+
AboutInputField.LastName,
276+
AboutInputField.DisplayName,
277+
AboutInputField.AboutMe
278+
)
277279
}
280+
},
281+
authenticationMethod = AuthenticationMethod.Bearer(accountStore.accessToken.orEmpty()),
282+
updateHandler = { event ->
283+
when (event) {
284+
AvatarPickerResult -> {
285+
loadAvatar(null, true)
286+
}
278287

279-
is AboutEditorResult -> {
280-
meDisplayName.text = event.profile.displayName.ifEmpty { accountStore.account.displayName }
281-
}
288+
is AboutEditorResult -> {
289+
meDisplayName.text = event.profile.displayName.ifEmpty { accountStore.account.displayName }
290+
}
282291

283-
else -> Unit
292+
else -> Unit
293+
}
294+
},
295+
onDismiss = {
296+
appLogWrapper.d(AppLog.T.MAIN, "Gravatar: Gravatar quick editor dismissed: ${page.value}")
284297
}
285-
},
286-
)
298+
)
299+
} catch (exception: Exception) {
300+
appLogWrapper.d(AppLog.T.MAIN, "Gravatar: Error opening Gravatar quick editor: ${exception.message}")
301+
}
287302
}
288303

289304
private fun withVeryfiedEmail(
290305
@StringRes unverifiedEmailMessageRes: Int,
291306
action: () -> Unit,
292307
) {
293308
if (accountStore.account.emailVerified) {
309+
appLogWrapper.d(AppLog.T.MAIN, "Email verified")
294310
action()
295311
} else {
312+
appLogWrapper.d(AppLog.T.MAIN, "Email not verified")
296313
view?.let { view ->
297314
sequencer.enqueue(
298315
SnackbarItem(

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

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,22 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2025-09-01 13:54:09+0000
3+
Translation-Revision-Date: 2025-10-15 13:16:18+0000
44
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))));
5-
Generator: GlotPress/4.0.1
5+
Generator: GlotPress/4.0.3
66
Language: ar
77
-->
88
<resources xmlns:tools="http://schemas.android.com/tools">
9+
<string name="error_deleting_term">حدث خطأ في حذف المصطلح</string>
10+
<string name="error_saving_term">حدث خطأ في حفظ المصطلح</string>
11+
<string name="add_term">إضافة مصطلح</string>
12+
<string name="term_delete_confirmation_message">هل أنت متأكد من رغبتك في حذف \"⁦%1$s⁩\"؟</string>
13+
<string name="term_delete_confirmation_title">حذف مصطلح</string>
14+
<string name="term_parent_label">الأصل</string>
15+
<string name="term_count">العدد: ⁦%1$d⁩</string>
16+
<string name="application_password_experimental_feature_note">\n\nملاحظة: تعد مصادقة كلمة مرور التطبيق على أجهزة Android ميزة تجريبية.</string>
17+
<string name="application_password_required_block_editor">محرر المكوِّنات</string>
18+
<string name="application_password_required_description">كلمات مرور التطبيقات هي طريقة أكثر أمانًا للاتصال بموقعك المستضاف ذاتيًا، وتمكين الدعم لميزات، مثل: ⁦%1$s⁩.</string>
19+
<string name="taxonomies_title">الفئات</string>
920
<string name="jetpack_rest_connection_error_login_wpcom">يتعذّر تسجيل الدخول إلى ووردبريس.كوم</string>
1021
<string name="jetpack_rest_connection_step_connect_site">ربط الموقع الإلكتروني بووردبريس.كوم</string>
1122
<string name="dataview_default_empty_message">لا يوجد شيء هنا</string>
@@ -31,7 +42,7 @@ Language: ar
3142
<string name="application_password_info_description_1">كلمات مرور التطبيقات هي طريقة آمنة للتطبيقات للوصول إلى موقعك بدون استخدام كلمة مرور حسابك.</string>
3243
<string name="application_password_info_title">كلمات مرور التطبيقات</string>
3344
<string name="application_password_disable_feature_description">سيؤدي تعطيل كلمة مرور التطبيق إلى إزالة معلومات تسجيل الدخول في ⁦%1$s⁩ من مواقعك. قد تحتاج إلى إعادة إضافة المواقع المتأثرة لإعادة تسجيل الدخول.</string>
34-
<string name="application_password_invalid_description">لم تعد كلمة مرور تطبيقك موجودة. يُرجى تسجيل الدخول مرة أخرى لإنشاء كلمة مرور جديدة للتطبيق </string>
45+
<string name="application_password_invalid_description">لم تعد كلمة مرور تطبيقك موجودة. يُرجى تسجيل الدخول مرة أخرى لإنشاء كلمة مرور جديدة للتطبيق.</string>
3546
<string name="subscribers_delete_success_message">حُذِف المشترك، لكن قد يستغرق الأمر دقيقة حتى يصبح الحذف ساري المفعول</string>
3647
<string name="subscribers_delete_success_title">حُذِف المشترك</string>
3748
<string name="subscribers_delete_confirmation_message">هل أنت متأكد من رغبتك في حذف هذا المشترك؟</string>
@@ -1167,8 +1178,8 @@ Language: ar
11671178
<string name="my_site_post_card_link_create_post">إنشاء مقالة</string>
11681179
<string name="my_site_create_next_post_excerpt">النشر بانتظام يساعد في بناء جمهورك!</string>
11691180
<string name="my_site_create_next_post_title">أنشئ تدوينتك التالية</string>
1170-
<string name="menu_visual_mode_switched_notice">تم التبديل إلى الوضع المرئي</string>
1171-
<string name="menu_html_mode_switched_notice">تم التبديل إلى وضع HTML</string>
1181+
<string name="menu_visual_mode_switched_notice">تم التبديل إلى المحرر المرئي</string>
1182+
<string name="menu_html_mode_switched_notice">تم التبديل إلى محرر الشفرة البرمجية</string>
11721183
<string name="post_link_copied_to_clipboard">تم نسخ الرابط إلى الحافظة</string>
11731184
<string name="comment_author_badge">الكاتب</string>
11741185
<string name="button_copy_link">نسخ الرابط</string>
@@ -2809,14 +2820,12 @@ Language: ar
28092820
<string name="signup_with_google_progress" tools:ignore="UnusedResources" a8c-src-lib="module:login">جاري التسجيل باستخدام Google…</string>
28102821
<string name="jetpack_connection_failed_with_reason">فشل الاتصال بـ Jetpack: %s</string>
28112822
<string name="jetpack_already_connected_toast">أنت متصل بالفعل بـ Jetpack</string>
2812-
<string name="menu_visual_mode">الوضع المرئي</string>
2813-
<string name="menu_html_mode">وضع HTML</string>
2823+
<string name="menu_visual_mode">المحرر المرئي</string>
28142824
<string name="menu_preview">معاينة</string>
28152825
<string name="menu_save_as_draft">حفظ كمسودة</string>
28162826
<string name="file_size_in_terabytes">%s تيرابايت</string>
28172827
<string name="file_size_in_gigabytes">%s جيجابايت</string>
28182828
<string name="file_size_in_megabytes">%s ميجابايت</string>
2819-
<string name="file_size_in_kilobytes">%s كيلوبايت</string>
28202829
<string name="file_size_in_bytes">%s بايت</string>
28212830
<string name="site_settings_quota_space_value">%1$s من %2$s</string>
28222831
<string name="site_settings_quota_space_hint">إذا كنت بحاجة إلى مزيد من المساحة، ففكر في ترقية خطة ووردبريس الخاصة بك.</string>

‎WordPress/src/main/res/values-az/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!--
33
Translation-Revision-Date: 2015-12-08 01:00:08+0000
44
Plural-Forms: nplurals=2; plural=n != 1;
5-
Generator: GlotPress/4.0.1
5+
Generator: GlotPress/4.0.3
66
Language: az
77
-->
88
<resources xmlns:tools="http://schemas.android.com/tools">

‎WordPress/src/main/res/values-bg/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!--
33
Translation-Revision-Date: 2018-12-10 19:56:03+0000
44
Plural-Forms: nplurals=2; plural=n != 1;
5-
Generator: GlotPress/4.0.1
5+
Generator: GlotPress/4.0.3
66
Language: bg
77
-->
88
<resources xmlns:tools="http://schemas.android.com/tools">

0 commit comments

Comments
 (0)