Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 23.8.1 into release 23.9 #22217

Merged
merged 9 commits into from
Dec 13, 2023
Merged

Merge 23.8.1 into release 23.9 #22217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8d697dd
Bump version number
mokagio Dec 12, 2023
0834423
Replace hyphen with dash in Bloganuary nudge text
wargcm Dec 13, 2023
6155351
Update Bloganury nude text's `value` to be one line
wargcm Dec 13, 2023
244ffbd
Replace hyphen with dash in Bloganuary nudge `ar` localization
mokagio Dec 13, 2023
41ccbcb
Replace hyphen with em dash in Bloganuary nudge `ar` localization
mokagio Dec 13, 2023
372a322
Replace hyphen with em dash in Bloganuary nudge `ro` localization
mokagio Dec 13, 2023
882a8e1
Replace hyphen with em dash in Bloganuary nudge text (#22213)
mokagio Dec 13, 2023
962d2f2
Update Fastlane to version 2.217.0
mokagio Dec 13, 2023
42f2751
Merge 'origin/release/23.9' into merge/hotfix-23.8.1-into-23.9
mokagio Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 28 additions & 31 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,29 +21,29 @@ GEM
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.5)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
artifactory (3.0.15)
ast (2.4.2)
atomos (0.1.3)
aws-eventstream (1.2.0)
aws-partitions (1.843.0)
aws-sdk-core (3.185.1)
aws-eventstream (~> 1, >= 1.0.2)
aws-eventstream (1.3.0)
aws-partitions (1.865.0)
aws-sdk-core (3.190.0)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
aws-sigv4 (~> 1.8)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.72.0)
aws-sdk-core (~> 3, >= 3.184.0)
aws-sdk-kms (1.74.0)
aws-sdk-core (~> 3, >= 3.188.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.136.0)
aws-sdk-core (~> 3, >= 3.181.0)
aws-sdk-s3 (1.141.0)
aws-sdk-core (~> 3, >= 3.189.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.6)
aws-sigv4 (1.6.1)
aws-sigv4 (~> 1.8)
aws-sigv4 (1.8.0)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
buildkit (1.5.0)
Expand Down Expand Up @@ -131,14 +131,13 @@ GEM
diffy (3.4.2)
digest-crc (0.6.5)
rake (>= 12.0.0, < 14.0.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
domain_name (0.6.20231109)
dotenv (2.8.1)
emoji_regex (3.2.3)
escape (0.0.4)
ethon (0.16.0)
ffi (>= 1.15.0)
excon (0.104.0)
excon (0.105.0)
faraday (1.10.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
Expand Down Expand Up @@ -170,7 +169,7 @@ GEM
faraday_middleware (1.2.0)
faraday (~> 1.0)
fastimage (2.2.7)
fastlane (2.216.0)
fastlane (2.217.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
Expand Down Expand Up @@ -237,7 +236,7 @@ GEM
git (1.18.0)
addressable (~> 2.8)
rchardet (~> 1.8)
google-apis-androidpublisher_v3 (0.51.0)
google-apis-androidpublisher_v3 (0.53.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-core (0.11.2)
addressable (~> 2.5, >= 2.5.1)
Expand All @@ -252,24 +251,25 @@ GEM
google-apis-core (>= 0.11.0, < 2.a)
google-apis-playcustomapp_v1 (0.13.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-storage_v1 (0.19.0)
google-apis-core (>= 0.9.0, < 2.a)
google-cloud-core (1.6.0)
google-cloud-env (~> 1.0)
google-apis-storage_v1 (0.29.0)
google-apis-core (>= 0.11.0, < 2.a)
google-cloud-core (1.6.1)
google-cloud-env (>= 1.0, < 3.a)
google-cloud-errors (~> 1.0)
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-cloud-env (2.1.0)
faraday (>= 1.0, < 3.a)
google-cloud-errors (1.3.1)
google-cloud-storage (1.44.0)
google-cloud-storage (1.45.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-iamcredentials_v1 (~> 0.1)
google-apis-storage_v1 (~> 0.19.0)
google-apis-storage_v1 (~> 0.29.0)
google-cloud-core (~> 1.6)
googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
googleauth (1.8.1)
faraday (>= 0.17.3, < 3.a)
googleauth (1.9.1)
faraday (>= 1.0, < 3.a)
google-cloud-env (~> 2.1)
jwt (>= 1.4, < 3.0)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
Expand All @@ -282,7 +282,7 @@ GEM
concurrent-ruby (~> 1.0)
java-properties (0.3.0)
jmespath (1.6.2)
json (2.6.3)
json (2.7.1)
jwt (2.7.1)
kramdown (2.4.0)
rexml
Expand Down Expand Up @@ -381,9 +381,6 @@ GEM
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.8.2)
unicode-display_width (2.5.0)
webrick (1.8.1)
word_wrap (1.0.0)
Expand Down
5 changes: 1 addition & 4 deletions ...s/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Prompts/DashboardBloganuaryCardCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,7 @@ private struct BloganuaryNudgeCardView: View {

static let description = NSLocalizedString(
"bloganuary.dashboard.card.description",
value: """
For the month of January, blogging prompts will come from Bloganuary - \
our community challenge to build a blogging habit for the new year.
""",
value: "For the month of January, blogging prompts will come from Bloganuary — our community challenge to build a blogging habit for the new year.",
comment: "Short description for the Bloganuary event, shown right below the title."
)

Expand Down
2 changes: 1 addition & 1 deletion WordPress/Resources/ar.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9562,7 +9562,7 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
"bloganuary.dashboard.card.button.learnMore" = "معرفة المزيد";

/* Short description for the Bloganuary event, shown right below the title. */
"bloganuary.dashboard.card.description" = "بالنسبة إلى شهر يناير، ستأتي موجّهات التدوين من Bloganuary - تحدٍّ مجتمعي لدينا لإنشاء عادة التدوين الخاصة بالعام الجديد.";
"bloganuary.dashboard.card.description" = "بالنسبة إلى شهر يناير، ستأتي موجّهات التدوين من Bloganuary — تحدٍّ مجتمعي لدينا لإنشاء عادة التدوين الخاصة بالعام الجديد.";

/* Title for the Bloganuary dashboard card. */
"bloganuary.dashboard.card.title" = "Bloganuary قادمة!";
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Resources/en-GB.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9568,7 +9568,7 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
"bloganuary.dashboard.card.button.learnMore" = "Learn more";

/* Short description for the Bloganuary event, shown right below the title. */
"bloganuary.dashboard.card.description" = "For the month of January, blogging prompts will come from Bloganuary – our community challenge to build a blogging habit for the new year.";
"bloganuary.dashboard.card.description" = "For the month of January, blogging prompts will come from Bloganuary — our community challenge to build a blogging habit for the new year.";

/* Title for the Bloganuary dashboard card. */
"bloganuary.dashboard.card.title" = "Bloganuary is coming!";
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Resources/en.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1352,7 +1352,7 @@
"bloganuary.dashboard.card.button.learnMore" = "Learn more";

/* Short description for the Bloganuary event, shown right below the title. */
"bloganuary.dashboard.card.description" = "For the month of January, blogging prompts will come from Bloganuary - our community challenge to build a blogging habit for the new year.";
"bloganuary.dashboard.card.description" = "For the month of January, blogging prompts will come from Bloganuary — our community challenge to build a blogging habit for the new year.";

/* Title for the Bloganuary dashboard card. */
"bloganuary.dashboard.card.title" = "Bloganuary is coming!";
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Resources/ro.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9568,7 +9568,7 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
"bloganuary.dashboard.card.button.learnMore" = "Află mai multe";

/* Short description for the Bloganuary event, shown right below the title. */
"bloganuary.dashboard.card.description" = "În luna ianuarie, îndemnurile de a scrie vor veni de la Bloganuary - provocarea comunității noastre de a crea un obicei de a scrie pe bloguri în noul an.";
"bloganuary.dashboard.card.description" = "În luna ianuarie, îndemnurile de a scrie vor veni de la Bloganuary — provocarea comunității noastre de a crea un obicei de a scrie pe bloguri în noul an.";

/* Title for the Bloganuary dashboard card. */
"bloganuary.dashboard.card.title" = "Bloganuary vine în curând!";
Expand Down