Skip to content

Commit 8f15251

Browse files
authored
Merge changes and fixes from 19.9.0.1 beta (#18631)
2 parents 3c63070 + 79180f1 commit 8f15251

File tree

80 files changed

+436
-773
lines changed

Some content is hidden

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

80 files changed

+436
-773
lines changed

RELEASE-NOTES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* [*] Block Editor: Gallery block: Fix broken "Link To" settings and add "Image Size" settings [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4841]
1414
* [*] Block Editor: Unsupported Block Editor: Prevent WordPress.com tour banner from displaying. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4820]
1515
* [*] Widgets: we fixed an issue where text appeared flipped in rtl languages [#18567]
16+
* [*] Stats: we fixed a crash that occurred sometimes in Stats [#18613]
1617
* [*] Posts list: we fixed an issue where the create button was not shown on iPad in split screen [#18609]
1718

1819
19.8

WordPress/Classes/ViewRelated/NUX/WordPressAuthenticationManager.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ extension WordPressAuthenticationManager: WordPressAuthenticatorDelegate {
525525
// This should be removed once the experiment is done
526526
//
527527
private func assignMySiteExperimentIfNeeded(event: WPAnalyticsStat) {
528-
if event == .signedIn {
528+
if event == .signedIn || event == .createdAccount {
529529
if FeatureFlag.mySiteDashboard.enabled {
530530
let isTreatment = BlogDashboardAB.shared.variant == .treatment
531531
MySiteSettings().setDefaultSection(isTreatment ? .dashboard : .siteMenu)

WordPress/Classes/ViewRelated/Stats/Insights/InsightType.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import Foundation
22

33
enum InsightType: Int, SiteStatsPinnable {
4-
case viewsVisitors
54
case growAudience
65
case customize
76
case latestPostSummary
@@ -20,6 +19,7 @@ enum InsightType: Int, SiteStatsPinnable {
2019
case allComments
2120
case allTagsAndCategories
2221
case allAnnual
22+
case viewsVisitors
2323

2424
// These Insights will be displayed in this order if a site's Insights have not been customized.
2525
static let defaultInsights: [InsightType] = [.mostPopularTime,

WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsTableViewController.swift

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -172,29 +172,8 @@ private extension SiteStatsInsightsTableViewController {
172172
}
173173

174174
func tableRowTypes() -> [ImmuTableRow.Type] {
175-
if FeatureFlag.statsNewInsights.enabled {
176-
return [InsightCellHeaderRow.self,
177-
ViewsVisitorsRow.self,
178-
GrowAudienceRow.self,
179-
CustomizeInsightsRow.self,
180-
LatestPostSummaryRow.self,
181-
TwoColumnStatsRow.self,
182-
PostingActivityRow.self,
183-
TabbedTotalsStatsRow.self,
184-
TopTotalsInsightStatsRow.self,
185-
MostPopularTimeInsightStatsRow.self,
186-
TotalInsightStatsRow.self,
187-
TableFooterRow.self,
188-
StatsErrorRow.self,
189-
StatsGhostGrowAudienceImmutableRow.self,
190-
StatsGhostChartImmutableRow.self,
191-
StatsGhostTwoColumnImmutableRow.self,
192-
StatsGhostTopImmutableRow.self,
193-
StatsGhostTabbedImmutableRow.self,
194-
StatsGhostPostingActivitiesImmutableRow.self]
195-
}
196-
197175
return [InsightCellHeaderRow.self,
176+
ViewsVisitorsRow.self,
198177
GrowAudienceRow.self,
199178
CustomizeInsightsRow.self,
200179
LatestPostSummaryRow.self,

WordPress/Jetpack/Resources/release_notes.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@
77
* [*] Block Editor: Gallery block: Fix broken "Link To" settings and add "Image Size" settings [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4841]
88
* [*] Block Editor: Unsupported Block Editor: Prevent WordPress.com tour banner from displaying. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4820]
99
* [*] Widgets: we fixed an issue where text appeared flipped in rtl languages [#18567]
10+
* [*] Stats: we fixed a crash that occurred sometimes in Stats [#18613]
11+
* [*] Posts list: we fixed an issue where the create button was not shown on iPad in split screen [#18609]
1012

WordPress/Resources/ar.lproj/Localizable.strings

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,8 @@
148148
/* Let's the user know that a third party sharing service was reconnected. The %@ is a placeholder for the service name. */
149149
"%@ was reconnected." = "تمت إعادة الاتصال بـ %@.";
150150

151-
/* Difference label for Period Overview stat, indicating change from previous period. Ex: +99.9K (5%) */
151+
/* Difference label for Insights Overview stat, indicating change from previous period. Ex: +99.9K(5%)
152+
Difference label for Period Overview stat, indicating change from previous period. Ex: +99.9K (5%) */
152153
"%@%@ (%@%%)" = "%1$@%2$@ (%3$@%%)";
153154

154155
/* Accessibility label for a post in the post list. The parameters are the title, and date respectively. For example, \"Let it Go, 1 hour ago.\" */
@@ -372,7 +373,7 @@ translators: Block name. %s: The localized block name */
372373
/* Story Intro welcome title */
373374
"A new way to create and publish engaging content on your site." = "طريقة جديدة لإنشاء ونشر محتوى جذّاب على موقعك.";
374375

375-
/* A VoiceOver hint to explain what the user gets when they select the 'Get to know the WordPress app' button. */
376+
/* A VoiceOver hint to explain what the user gets when they select the 'Get to know the WordPress/Jetpack app' button. */
376377
"A series of steps helping you to explore the app." = "سلسلة من الخطوات تساعدك على استكشاف التطبيق.";
377378

378379
/* A VoiceOver hint to explain what the user gets when they select the 'Customize Your Site' button. */
@@ -665,6 +666,7 @@ translators: Block name. %s: The localized block name */
665666
Browse all themes selection title
666667
Displays all of the historical threats
667668
Displays all of the Notifications, unfiltered
669+
Title of all Blogging Prompts filter.
668670
Title of all Comments filter. */
669671
"All" = "الكل";
670672

@@ -1331,8 +1333,7 @@ translators: Block name. %s: The localized block name */
13311333
Title for the warning shown to the user when he refuses to re-login when the authToken is missing. */
13321334
"Careful!" = "كن حذرًا!";
13331335

1334-
/* Example prompt for blogging prompts in the create new bottom action sheet.
1335-
Example prompt for the Prompts card in Feature Introduction. */
1336+
/* Example prompt for the Prompts card in Feature Introduction. */
13361337
"Cast the movie of your life." = "قم ببناء فيلم حياتك.";
13371338

13381339
/* Label for Categories
@@ -1781,9 +1782,6 @@ translators: Block name. %s: The localized block name */
17811782
/* Title of alert prompting users to verify their accounts while attempting to publish */
17821783
"Confirm your email first" = "قم بالتأكيد على بريدك الإلكتروني أولاً";
17831784

1784-
/* Title of a Quick Start Tour */
1785-
"Congrats on finishing Quick Start 🎉" = "تهانينا على الانتهاء من البدء السريع &#127881؛";
1786-
17871785
/* Subtitle of the congratulation screen that appears when all the tasks are completed */
17881786
"Congratulations on completing your list. A job well done." = "تهانينا لك على إكمال قائمتك. عمل متقن.";
17891787

@@ -4414,6 +4412,7 @@ translators: Block name. %s: The localized block name */
44144412
/* Noun. Title for media button.
44154413
Noun. Title. Links to the blog's Media library.
44164414
Tab bar title for the Media tab in Media Picker
4415+
The menu item to select during a guided tour.
44174416
Title for Media Library section of the app.
44184417
Title for the media section in site settings screen
44194418
Title label for the media settings section in the app settings */
@@ -4973,7 +4972,8 @@ translators: %s: Select control button label e.g. \"Button width\" */
49734972
/* Error title for alert, shown to a user who is trying to share to Facebook but does not have any available Facebook Pages. */
49744973
"Not Connected" = "غير متصل";
49754974

4976-
/* Nicer dialog answer for \"No\". */
4975+
/* Nicer dialog answer for \"No\".
4976+
Title of a button that cancels enabling notifications when tapped */
49774977
"Not Now" = "ليس الآن";
49784978

49794979
/* Display value for Support email field if there is no user email address. */
@@ -5142,6 +5142,7 @@ translators: %s: Select control button label e.g. \"Button width\" */
51425142
/* An informal exclaimation that means `something went wrong`.
51435143
Title for the view when there's an error loading a comment.
51445144
Title for the view when there's an error loading Activity Log
5145+
Title for the view when there's an error loading blogging prompts.
51455146
Title for the view when there's an error loading scan status
51465147
Title for the view when there's an error loading the history
51475148
Title for the view when there's an error loading the plugin
@@ -5811,7 +5812,8 @@ translators: %s: Select control button label e.g. \"Button width\" */
58115812
"Projects" = "مشاريع";
58125813

58135814
/* Title label for blogging prompts in the create new bottom action sheet.
5814-
Title label for the Prompts card in My Sites tab. */
5815+
Title label for the Prompts card in My Sites tab.
5816+
View title for Blogging Prompts list. */
58155817
"Prompts" = "المطالبات";
58165818

58175819
/* Privacy setting for posts set to 'Public' (default). Should be the same as in core WP.
@@ -8581,6 +8583,7 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
85818583
Label for Period Overview views
85828584
Label for post views count.
85838585
Stats Views Label
8586+
Title for Views count in the legend of the Stats Insights views and visitors line chart
85848587
Today's Stats 'Views' label */
85858588
"Views" = "مشاهدات";
85868589

@@ -8615,6 +8618,7 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
86158618
Label for Period Overview visitors
86168619
Stats Visitors Label
86178620
This appears in the legend of the period chart; Visitors are superimposed over Views in that case.
8621+
Title for Visitors count in the legend of the Stats Insights views and visitors line chart
86188622
Today's Stats 'Visitors' label */
86198623
"Visitors" = "الزوار";
86208624

@@ -9528,9 +9532,6 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
95289532
/* The menu item to select during a guided tour. */
95299533
"connections" = "الاتصالات";
95309534

9531-
/* subhead shown to users when they complete all Quick Start items */
9532-
"doesn’t it feel good to cross things off a list?" = "أليس من الأفضل حذف أشياء من القائمة؟";
9533-
95349535
/* No comment provided by engineer. */
95359536
"double-tap to change unit" = "أنقر نقرًا مزدوجًا لتغيير الوحدة";
95369537

@@ -9770,6 +9771,7 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
97709771
/* Item 2 of delete screen section listing things that will be deleted. */
97719772
"• Users & Authors" = "• المستخدمون والكاتبون";
97729773

9773-
/* Title label that indicates the prompt has been answered. */
9774+
/* Label that indicates a blogging prompt has been answered.
9775+
Title label that indicates the prompt has been answered. */
97749776
"✓ Answered" = "✓ تم الرد";
97759777

WordPress/Resources/bg.lproj/Localizable.strings

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@
178178
Browse all themes selection title
179179
Displays all of the historical threats
180180
Displays all of the Notifications, unfiltered
181+
Title of all Blogging Prompts filter.
181182
Title of all Comments filter. */
182183
"All" = "Всички";
183184

@@ -1465,6 +1466,7 @@
14651466
/* Noun. Title for media button.
14661467
Noun. Title. Links to the blog's Media library.
14671468
Tab bar title for the Media tab in Media Picker
1469+
The menu item to select during a guided tour.
14681470
Title for Media Library section of the app.
14691471
Title for the media section in site settings screen
14701472
Title label for the media settings section in the app settings */
@@ -1643,7 +1645,8 @@
16431645
No size class defined for the image. Should be the same as in core WP. */
16441646
"None" = "Без";
16451647

1646-
/* Nicer dialog answer for \"No\". */
1648+
/* Nicer dialog answer for \"No\".
1649+
Title of a button that cancels enabling notifications when tapped */
16471650
"Not Now" = "Не сега";
16481651

16491652
/* Shown when user is loading Menu item options and no items are available, such as posts, pages, etc. */
@@ -1720,6 +1723,7 @@
17201723
/* An informal exclaimation that means `something went wrong`.
17211724
Title for the view when there's an error loading a comment.
17221725
Title for the view when there's an error loading Activity Log
1726+
Title for the view when there's an error loading blogging prompts.
17231727
Title for the view when there's an error loading scan status
17241728
Title for the view when there's an error loading the history
17251729
Title for the view when there's an error loading the plugin
@@ -3003,6 +3007,7 @@
30033007
Label for Period Overview views
30043008
Label for post views count.
30053009
Stats Views Label
3010+
Title for Views count in the legend of the Stats Insights views and visitors line chart
30063011
Today's Stats 'Views' label */
30073012
"Views" = "Преглеждания";
30083013

@@ -3028,6 +3033,7 @@
30283033
Label for Period Overview visitors
30293034
Stats Visitors Label
30303035
This appears in the legend of the period chart; Visitors are superimposed over Views in that case.
3036+
Title for Visitors count in the legend of the Stats Insights views and visitors line chart
30313037
Today's Stats 'Visitors' label */
30323038
"Visitors" = "Посетители";
30333039

WordPress/Resources/cs.lproj/Localizable.strings

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,8 @@
142142
/* Let's the user know that a third party sharing service was reconnected. The %@ is a placeholder for the service name. */
143143
"%@ was reconnected." = "%@ byl opět spojen.";
144144

145-
/* Difference label for Period Overview stat, indicating change from previous period. Ex: +99.9K (5%) */
145+
/* Difference label for Insights Overview stat, indicating change from previous period. Ex: +99.9K(5%)
146+
Difference label for Period Overview stat, indicating change from previous period. Ex: +99.9K (5%) */
146147
"%@%@ (%@%%)" = "%1$@%2$@ (%3$@%%)";
147148

148149
/* Accessibility label for a post in the post list. The parameters are the title, and date respectively. For example, \"Let it Go, 1 hour ago.\" */
@@ -647,6 +648,7 @@ translators: Block name. %s: The localized block name */
647648
Browse all themes selection title
648649
Displays all of the historical threats
649650
Displays all of the Notifications, unfiltered
651+
Title of all Blogging Prompts filter.
650652
Title of all Comments filter. */
651653
"All" = "Vše";
652654

@@ -1313,8 +1315,7 @@ translators: Block name. %s: The localized block name */
13131315
Title for the warning shown to the user when he refuses to re-login when the authToken is missing. */
13141316
"Careful!" = "Opatrně!";
13151317

1316-
/* Example prompt for blogging prompts in the create new bottom action sheet.
1317-
Example prompt for the Prompts card in Feature Introduction. */
1318+
/* Example prompt for the Prompts card in Feature Introduction. */
13181319
"Cast the movie of your life." = "Obsaďte film svého života.";
13191320

13201321
/* Label for Categories
@@ -1751,9 +1752,6 @@ translators: Block name. %s: The localized block name */
17511752
/* Title of alert prompting users to verify their accounts while attempting to publish */
17521753
"Confirm your email first" = "Nejprve potvrďte svůj e-mail";
17531754

1754-
/* Title of a Quick Start Tour */
1755-
"Congrats on finishing Quick Start 🎉" = "Gratulujeme k dokončení rychlého startu 🎉";
1756-
17571755
/* Subtitle of the congratulation screen that appears when all the tasks are completed */
17581756
"Congratulations on completing your list. A job well done." = "Gratulujeme k dokončení vašeho seznamu. Dobře odvedená práce.";
17591757

@@ -4351,6 +4349,7 @@ translators: Block name. %s: The localized block name */
43514349
/* Noun. Title for media button.
43524350
Noun. Title. Links to the blog's Media library.
43534351
Tab bar title for the Media tab in Media Picker
4352+
The menu item to select during a guided tour.
43544353
Title for Media Library section of the app.
43554354
Title for the media section in site settings screen
43564355
Title label for the media settings section in the app settings */
@@ -4910,7 +4909,8 @@ translators: %s: Select control button label e.g. \"Button width\" */
49104909
/* Error title for alert, shown to a user who is trying to share to Facebook but does not have any available Facebook Pages. */
49114910
"Not Connected" = "Nepřipojen";
49124911

4913-
/* Nicer dialog answer for \"No\". */
4912+
/* Nicer dialog answer for \"No\".
4913+
Title of a button that cancels enabling notifications when tapped */
49144914
"Not Now" = "Později";
49154915

49164916
/* Display value for Support email field if there is no user email address. */
@@ -5073,6 +5073,7 @@ translators: %s: Select control button label e.g. \"Button width\" */
50735073
/* An informal exclaimation that means `something went wrong`.
50745074
Title for the view when there's an error loading a comment.
50755075
Title for the view when there's an error loading Activity Log
5076+
Title for the view when there's an error loading blogging prompts.
50765077
Title for the view when there's an error loading scan status
50775078
Title for the view when there's an error loading the history
50785079
Title for the view when there's an error loading the plugin
@@ -5742,7 +5743,8 @@ translators: %s: Select control button label e.g. \"Button width\" */
57425743
"Projects" = "Projekty";
57435744

57445745
/* Title label for blogging prompts in the create new bottom action sheet.
5745-
Title label for the Prompts card in My Sites tab. */
5746+
Title label for the Prompts card in My Sites tab.
5747+
View title for Blogging Prompts list. */
57465748
"Prompts" = "Výzvy";
57475749

57485750
/* Privacy setting for posts set to 'Public' (default). Should be the same as in core WP.
@@ -8479,6 +8481,7 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
84798481
Label for Period Overview views
84808482
Label for post views count.
84818483
Stats Views Label
8484+
Title for Views count in the legend of the Stats Insights views and visitors line chart
84828485
Today's Stats 'Views' label */
84838486
"Views" = "Zobrazení";
84848487

@@ -8510,6 +8513,7 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
85108513
Label for Period Overview visitors
85118514
Stats Visitors Label
85128515
This appears in the legend of the period chart; Visitors are superimposed over Views in that case.
8516+
Title for Visitors count in the legend of the Stats Insights views and visitors line chart
85138517
Today's Stats 'Visitors' label */
85148518
"Visitors" = "Návštěvníci";
85158519

@@ -9404,9 +9408,6 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
94049408
/* The menu item to select during a guided tour. */
94059409
"connections" = "připojení";
94069410

9407-
/* subhead shown to users when they complete all Quick Start items */
9408-
"doesn’t it feel good to cross things off a list?" = "není to dobrý pocit, když věci odškrtnete ze seznamu?";
9409-
94109411
/* No comment provided by engineer. */
94119412
"double-tap to change unit" = "dvojitým klepnutím změníte jednotku";
94129413

@@ -9628,6 +9629,7 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
96289629
/* Item 2 of delete screen section listing things that will be deleted. */
96299630
"• Users & Authors" = "• Uživatelé a autoři";
96309631

9631-
/* Title label that indicates the prompt has been answered. */
9632+
/* Label that indicates a blogging prompt has been answered.
9633+
Title label that indicates the prompt has been answered. */
96329634
"✓ Answered" = "✓ Odpovězeno";
96339635

0 commit comments

Comments
 (0)