From bcd5a696140d931e42fa03ab80f933ec6429bb71 Mon Sep 17 00:00:00 2001 From: Weston Ruter Date: Thu, 13 May 2021 16:04:33 -0700 Subject: [PATCH 1/4] Revise copy for settings page description of Paired URL Structures Co-authored-by: Joshua Wold --- assets/src/settings-page/paired-url-structure.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/src/settings-page/paired-url-structure.js b/assets/src/settings-page/paired-url-structure.js index 61123d43e1e..e6bd2999d05 100644 --- a/assets/src/settings-page/paired-url-structure.js +++ b/assets/src/settings-page/paired-url-structure.js @@ -139,7 +139,7 @@ export function PairedUrlStructure( { focusedSection } ) { { __html: sprintf( /* translators: 1: AMP Analytics docs URL */ - __( 'When using the Transitional or Reader template modes, your site is in a “Paired AMP” configuration where your canonical URLs are non-AMP and then you have separate AMP versions of your pages with AMP-specific URLs. The structure of the paired AMP URL is not important, whether using a query parameter or path suffix. The use of a query parameter is the most compatible across various sites and it has the benefit of not resulting in a 404 if the AMP plugin is deactivated, so that is why it is the default. Please note that changing the paired URL structure can cause AMP pages to disappear from search results until your site has been re-indexed. So if the current structure of your paired AMP URLs works for you, there is no need to change. If you\'re migrating from another AMP plugin that used a different paired URL structure than the default, then you may want to change this setting. Learn more.', 'amp' ), + __( 'When using the Transitional or Reader template modes, your site is in a “Paired AMP” configuration. Canonical URLs are non-AMP and separate AMP versions of your pages have AMP-specific URLs. The structure of a paired AMP URL is not important, whether using a query parameter or path suffix. The use of a query parameter is the most compatible across various sites and doesn\'t result in a 404 if the AMP plugin is deactivated. Note: Changing the paired URL structure can cause AMP pages to disappear from search results until your site is re-indexed. If you\'re migrating from another AMP plugin with a different paired URL structure, then you may want to change this setting. Otherwise we recommend leaving it as is. Learn more', 'amp' ), __( 'https://amp-wp.org/?p=10004', 'amp' ), ), } } From 65e7d83a786ad464a9ee5d49a514e96870951b90 Mon Sep 17 00:00:00 2001 From: Weston Ruter Date: Thu, 13 May 2021 16:57:58 -0700 Subject: [PATCH 2/4] Fix translators comment --- assets/src/settings-page/paired-url-structure.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/src/settings-page/paired-url-structure.js b/assets/src/settings-page/paired-url-structure.js index e6bd2999d05..00b405d61b4 100644 --- a/assets/src/settings-page/paired-url-structure.js +++ b/assets/src/settings-page/paired-url-structure.js @@ -138,7 +138,7 @@ export function PairedUrlStructure( { focusedSection } ) {

Note: Changing the paired URL structure can cause AMP pages to disappear from search results until your site is re-indexed. If you\'re migrating from another AMP plugin with a different paired URL structure, then you may want to change this setting. Otherwise we recommend leaving it as is. Learn more', 'amp' ), __( 'https://amp-wp.org/?p=10004', 'amp' ), ), From f2fb4f3631fa391d730c8d2ccbe4eb93214167c2 Mon Sep 17 00:00:00 2001 From: Weston Ruter Date: Mon, 17 May 2021 11:02:41 -0700 Subject: [PATCH 3/4] Further refine paired URL structure notice --- assets/src/settings-page/paired-url-structure.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/src/settings-page/paired-url-structure.js b/assets/src/settings-page/paired-url-structure.js index 00b405d61b4..8650e8946ab 100644 --- a/assets/src/settings-page/paired-url-structure.js +++ b/assets/src/settings-page/paired-url-structure.js @@ -139,7 +139,7 @@ export function PairedUrlStructure( { focusedSection } ) { { __html: sprintf( /* translators: 1: AMP Paired URL Structure documentation URL */ - __( 'When using the Transitional or Reader template modes, your site is in a “Paired AMP” configuration. Canonical URLs are non-AMP and separate AMP versions of your pages have AMP-specific URLs. The structure of a paired AMP URL is not important, whether using a query parameter or path suffix. The use of a query parameter is the most compatible across various sites and doesn\'t result in a 404 if the AMP plugin is deactivated. Note: Changing the paired URL structure can cause AMP pages to disappear from search results until your site is re-indexed. If you\'re migrating from another AMP plugin with a different paired URL structure, then you may want to change this setting. Otherwise we recommend leaving it as is. Learn more', 'amp' ), + __( 'When using the Transitional or Reader template modes, your site is in a “Paired AMP” configuration. Your site's canonical URLs are non-AMP, and the separate AMP versions of your pages have AMP-specific URLs. The structure of a paired AMP URL is not important, whether using a query parameter or path suffix. The use of a query parameter is the most compatible across various sites and it has the benefit of not resulting in a 404 if the AMP plugin is deactivated. Note: Changing the paired URL structure can cause AMP pages to temporarily disappear from search results until your site is re-indexed. If you\'re migrating from another AMP plugin with a different paired URL structure, then you may want to change this setting. Otherwise we recommend leaving it as is. Learn more', 'amp' ), __( 'https://amp-wp.org/?p=10004', 'amp' ), ), } } From 3f67835cbb413322f07983184aa3707986c893b6 Mon Sep 17 00:00:00 2001 From: Weston Ruter Date: Mon, 17 May 2021 11:05:25 -0700 Subject: [PATCH 4/4] Fix syntax error --- assets/src/settings-page/paired-url-structure.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/src/settings-page/paired-url-structure.js b/assets/src/settings-page/paired-url-structure.js index 8650e8946ab..181099eec2e 100644 --- a/assets/src/settings-page/paired-url-structure.js +++ b/assets/src/settings-page/paired-url-structure.js @@ -139,7 +139,7 @@ export function PairedUrlStructure( { focusedSection } ) { { __html: sprintf( /* translators: 1: AMP Paired URL Structure documentation URL */ - __( 'When using the Transitional or Reader template modes, your site is in a “Paired AMP” configuration. Your site's canonical URLs are non-AMP, and the separate AMP versions of your pages have AMP-specific URLs. The structure of a paired AMP URL is not important, whether using a query parameter or path suffix. The use of a query parameter is the most compatible across various sites and it has the benefit of not resulting in a 404 if the AMP plugin is deactivated. Note: Changing the paired URL structure can cause AMP pages to temporarily disappear from search results until your site is re-indexed. If you\'re migrating from another AMP plugin with a different paired URL structure, then you may want to change this setting. Otherwise we recommend leaving it as is. Learn more', 'amp' ), + __( 'When using the Transitional or Reader template modes, your site is in a “Paired AMP” configuration. Your site\'s canonical URLs are non-AMP, and the separate AMP versions of your pages have AMP-specific URLs. The structure of a paired AMP URL is not important, whether using a query parameter or path suffix. The use of a query parameter is the most compatible across various sites and it has the benefit of not resulting in a 404 if the AMP plugin is deactivated. Note: Changing the paired URL structure can cause AMP pages to temporarily disappear from search results until your site is re-indexed. If you\'re migrating from another AMP plugin with a different paired URL structure, then you may want to change this setting. Otherwise we recommend leaving it as is. Learn more', 'amp' ), __( 'https://amp-wp.org/?p=10004', 'amp' ), ), } }