Skip to content

Commit 22f542f

Browse files
mokagiomokagio
authored
Merge release/2.35 into trunk (#1707)
2 parents 950f336 + 5139398 commit 22f542f

File tree

10 files changed

+54
-13
lines changed

10 files changed

+54
-13
lines changed

‎.buildkite/release-pipelines/new-beta-release.yml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
2+
---
3+
4+
steps:
5+
- label: "New Beta Release"
6+
plugins: [$CI_TOOLKIT_PLUGIN]
7+
command: |
8+
echo '--- :robot_face: Use bot for Git operations'
9+
source use-bot-for-git wpmobilebot
10+
11+
echo '--- :git: Checkout release branch'
12+
.buildkite/commands/checkout-release-branch.sh
13+
14+
echo '--- :ruby: Set up Ruby Tools'
15+
install_gems
16+
17+
echo '--- :closed_lock_with_key: Access secrets'
18+
bundle exec fastlane run configure_apply
19+
20+
echo '--- :shipit: New Beta Release'
21+
bundle exec fastlane new_beta_release skip_confirm:true
22+
agents:
23+
queue: tumblr-metal
24+
retry:
25+
manual:
26+
# If failed, we prefer retrying via ReleaseV2 rather than Buildkite.
27+
# Rationale: ReleaseV2 is the source of truth for the process and track links to the various builds.
28+
allowed: false

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2024-07-31 18:54:11+0000
3+
Translation-Revision-Date: 2024-09-19 12:54:03+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;
55
Generator: GlotPress/2.4.0-alpha
66
Language: ar
77
-->
88
<resources>
9+
<string name="login_with_password_message">إدخال كلمة المرور الخاصة بالحساب ⁦%1$s⁩</string>
910
<string name="magic_link_confirm_code_message">لقد أرسلنا كودًا إلى \n%1$s. سيكون هذا الكود صالحًا لبضع دقائق.</string>
1011
<string name="magic_link_confirm_code_enter_pass_label">إدخال كلمة المرور</string>
1112
<string name="magic_link_login_with_wordpress_or_break">أو</string>

‎Simplenote/src/main/res/values-de/strings.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2024-08-01 09:54:03+0000
3+
Translation-Revision-Date: 2024-09-19 09:54:03+0000
44
Plural-Forms: nplurals=2; plural=n != 1;
55
Generator: GlotPress/2.4.0-alpha
66
Language: de
77
-->
88
<resources>
9+
<string name="login_with_password_message">Gib das Passwort für das Konto %1$s ein</string>
910
<string name="magic_link_confirm_code_message">Wir haben einen Code gesendet an: \n%1$s. Der Code ist einige Minuten gültig.</string>
1011
<string name="magic_link_confirm_code_enter_pass_label">Passwort eingeben</string>
1112
<string name="magic_link_login_with_wordpress_or_break">Oder</string>

‎Simplenote/src/main/res/values-es/strings.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2024-08-01 15:54:04+0000
3+
Translation-Revision-Date: 2024-09-19 16:54:03+0000
44
Plural-Forms: nplurals=2; plural=n != 1;
55
Generator: GlotPress/2.4.0-alpha
66
Language: es
77
-->
88
<resources>
9+
<string name="login_with_password_message">Introduce la contraseña de la cuenta %1$s</string>
910
<string name="magic_link_confirm_code_message">Hemos enviado un código a \n%1$s. El código será válido durante unos minutos.</string>
1011
<string name="magic_link_confirm_code_enter_pass_label">Introduce la contraseña</string>
1112
<string name="magic_link_login_with_wordpress_or_break">O</string>

‎Simplenote/src/main/res/values-he/strings.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2024-08-01 15:54:03+0000
3+
Translation-Revision-Date: 2024-09-19 14:54:03+0000
44
Plural-Forms: nplurals=2; plural=n != 1;
55
Generator: GlotPress/2.4.0-alpha
66
Language: he_IL
77
-->
88
<resources>
9+
<string name="login_with_password_message">יש להזין את הסיסמה לחשבון ⁦%1$s⁩</string>
910
<string name="magic_link_confirm_code_message">שלחנו קוד אל \n%1$s. הקוד הזה יהיה בתוקף למשך מספר דקות.</string>
1011
<string name="magic_link_confirm_code_enter_pass_label">להזין סיסמה</string>
1112
<string name="magic_link_login_with_wordpress_or_break">או</string>

‎Simplenote/src/main/res/values-ko/strings.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2024-08-01 09:54:03+0000
3+
Translation-Revision-Date: 2024-09-20 09:54:16+0000
44
Plural-Forms: nplurals=1; plural=0;
55
Generator: GlotPress/2.4.0-alpha
66
Language: ko_KR
77
-->
88
<resources>
9+
<string name="login_with_password_message">계정 %1$s의 비밀번호를 입력하세요.</string>
910
<string name="magic_link_confirm_code_message">다음으로 코드를 보냈습니다: \n%1$s 코드는 몇 분 동안 유효합니다.</string>
1011
<string name="magic_link_confirm_code_enter_pass_label">비밀번호 입력</string>
1112
<string name="magic_link_login_with_wordpress_or_break">또는</string>

‎Simplenote/src/main/res/values-ru/strings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2024-09-18 09:54:03+0000
3+
Translation-Revision-Date: 2024-09-19 14:54:03+0000
44
Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);
55
Generator: GlotPress/2.4.0-alpha
66
Language: ru
77
-->
88
<resources>
9-
<string name="login_with_password_message">Введите пароль учётной записи %1$s</string>
9+
<string name="login_with_password_message">Введите пароль для учётной записи %1$s</string>
1010
<string name="magic_link_confirm_code_message">Код отправлен на адрес \n%1$s. Код будет действителен в течение нескольких минут.</string>
1111
<string name="magic_link_confirm_code_enter_pass_label">Введите пароль</string>
1212
<string name="magic_link_login_with_wordpress_or_break">или</string>

‎fastlane/lanes/localization.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,15 @@
103103
end
104104

105105
desc 'Download the latest app translations from GlotPress and update the strings.xml files accordingly'
106-
lane :download_translations do
106+
lane :download_translations do |run_lint: true|
107107
# android_update_release_notes requires a relative path
108108
res_folder_relative_path = RES_FOLDER.delete_prefix(PROJECT_ROOT_FOLDER)
109109

110110
android_download_translations(
111111
res_dir: res_folder_relative_path,
112112
glotpress_url: GLOTPRESS_APP_STRINGS_PROJECT_URL,
113113
locales: SUPPORTED_LOCALES,
114-
lint_task: 'lintRelease'
114+
lint_task: run_lint ? 'lintRelease' : nil
115115
)
116116
end
117117
end

‎fastlane/lanes/release.rb

+10-2
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,11 @@
137137
# Print computed version and build to let user double-check outcome in logs
138138
UI.success("Done! New beta version: #{release_version_current}. New build code: #{build_code_current}")
139139

140-
download_translations
140+
download_translations(
141+
# skip lint in CI as a workaround to the task running in an agent that fails to download the Gradle version this project needs.
142+
# The long term fix is to upgrade Gradle here.
143+
run_lint: is_ci == false
144+
)
141145
download_metadata_strings
142146

143147
UI.important('Pushing changes to remote and triggering the beta build...')
@@ -163,7 +167,11 @@
163167
configure_apply(force: is_ci)
164168

165169
check_translation_progress_all unless is_ci
166-
download_translations
170+
download_translations(
171+
# skip lint in CI as a workaround to the task running in an agent that fails to download the Gradle version this project needs.
172+
# The long term fix is to upgrade Gradle here.
173+
run_lint: is_ci == false
174+
)
167175

168176
UI.message 'Bumping final release version and build code...'
169177
VERSION_FILE.write_version(

‎version.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
versionName=2.35-rc-1
2-
versionCode=175
1+
versionName=2.35-rc-2
2+
versionCode=176

0 commit comments

Comments
 (0)