jenkins-bot has submitted this change and it was merged.

Change subject: settings: Fix strings, copy and capitalization
......................................................................


settings: Fix strings, copy and capitalization

Addresses the issues pointed out in:
https://gerrit.wikimedia.org/r/#/c/140086/16/i18n/en.json

Discussion:
https://trello.com/c/NYQ0nMeE/101-hovercards-phase-3

Bug: 68812
Change-Id: I7b4f6d2be08a1ee20b19aec95d99a73fd4bf9d29
---
M Popups.php
M i18n/en.json
M i18n/qqq.json
M resources/ext.popups.settings.js
4 files changed, 18 insertions(+), 18 deletions(-)

Approvals:
  Siebrand: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Popups.php b/Popups.php
index a32f091..42a54f8 100644
--- a/Popups.php
+++ b/Popups.php
@@ -79,10 +79,10 @@
                        'popups-last-edited',
                        "popups-settings-title",
                        "popups-settings-description",
-                       "popups-settings-option-read-quickly",
-                       "popups-settings-option-read-quickly-description",
-                       "popups-settings-option-monitor-or-edit",
-                       "popups-settings-option-monitor-or-edit-description",
+                       "popups-settings-option-simple",
+                       "popups-settings-option-simple-description",
+                       "popups-settings-option-advanced",
+                       "popups-settings-option-advanced-description",
                        "popups-settings-option-off",
                        "popups-settings-option-off-description",
                        "popups-settings-save",
diff --git a/i18n/en.json b/i18n/en.json
index 94e7623..2b8a7a4 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -6,15 +6,15 @@
     "popups-desc": "Displays hovercards with summaries of page contents when 
the user hovers over a page link",
     "popups-last-edited": "Last edited $1",
     "popups-redirects": "redirects to <h3>$1</h3>",
-    "popups-settings-title": "Article Preview",
+    "popups-settings-title": "Page preview",
     "popups-settings-description": "This tool lets you preview blue links and 
references",
-    "popups-settings-option-read-quickly": "Read Quickly",
-    "popups-settings-option-read-quickly-description": "See the lead sentence 
of an article and see a preview image.<br />This is recommended for readers.",
-    "popups-settings-option-monitor-or-edit": "Monitor or Edit",
-    "popups-settings-option-monitor-or-edit-description": "Use advanced 
actions to monitor and edit the content of blue links",
-    "popups-settings-option-off": "Turn Previews off",
+    "popups-settings-option-simple": "Simple",
+    "popups-settings-option-simple-description": "See the lead sentence of a 
page and a preview image. This is recommended for readers",
+    "popups-settings-option-advanced": "Advanced",
+    "popups-settings-option-advanced-description": "See link previews and 
access editing function menus. This is used by many editors.",
+    "popups-settings-option-off": "Disable previews",
     "popups-settings-option-off-description": "You can change this setting 
using the link in the footer of the page",
     "popups-settings-save": "Save",
     "popups-settings-cancel": "Cancel",
-    "popups-settings-enable": "Enable Hovercards"
+    "popups-settings-enable": "Enable previews"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 29ba62a..a7b20f0 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -11,11 +11,11 @@
        "popups-redirects": "Unused at this time.\n\nMessage shown when the 
hovercard is showing a redirected page.\n\nParameters:\n* $1 - ...",
        "popups-settings-title": "Title used for the setting's dialog",
        "popups-settings-description": "Description for the setting's dialog",
-       "popups-settings-option-read-quickly": "Title for the read quickly or 
hovercard option",
-       "popups-settings-option-read-quickly-description": "Description for the 
read quickly or hovercard option",
-       "popups-settings-option-monitor-or-edit": "Title for the monitor or 
edit or navigation popups option",
-       "popups-settings-option-monitor-or-edit-description": "Description for 
the monitor or edit or navigation popups option",
-       "popups-settings-option-off": "Title for turn off hovercards option",
+       "popups-settings-option-simple": "Title for the reader hovercard 
option",
+       "popups-settings-option-simple-description": "Description for the 
reader hovercard option",
+       "popups-settings-option-advanced": "Title for the editor or navigation 
popups option",
+       "popups-settings-option-advanced-description": "Description for the 
editor or navigation popups option",
+       "popups-settings-option-off": "Title to turn off hovercards option",
        "popups-settings-option-off-description": "Description for turn off 
hovercards option",
        "popups-settings-save": "Save buttton for the setting's 
dialoag\n{{Identical|Save}}",
        "popups-settings-cancel": "Cancel button for the setting's 
dialog\n{{Identical|Cancel}}",
diff --git a/resources/ext.popups.settings.js b/resources/ext.popups.settings.js
index 1d29630..9851930 100644
--- a/resources/ext.popups.settings.js
+++ b/resources/ext.popups.settings.js
@@ -37,8 +37,8 @@
                        $form = $( '<form>' ).append( $radioGroup, $actions ),
                        $main = $( '<main>' ).append( $description, $form ),
                        options = [
-                               [ mw.message( 
'popups-settings-option-read-quickly' ).text(), mw.message( 
'popups-settings-option-read-quickly-description' ).text(), 'hovercard.svg' ],
-                               [ mw.message( 
'popups-settings-option-monitor-or-edit' ).text(), mw.message( 
'popups-settings-option-monitor-or-edit-description' ).text(), 'navpop.svg' ],
+                               [ mw.message( 'popups-settings-option-simple' 
).text(), mw.message( 'popups-settings-option-simple-description' ).text(), 
'hovercard.svg' ],
+                               [ mw.message( 'popups-settings-option-advanced' 
).text(), mw.message( 'popups-settings-option-advanced-description' ).text(), 
'navpop.svg' ],
                                [ mw.message( 'popups-settings-option-off' 
).text(), mw.message( 'popups-settings-option-off-description' ).text() ]
                        ];
 

-- 
To view, visit https://gerrit.wikimedia.org/r/155057
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7b4f6d2be08a1ee20b19aec95d99a73fd4bf9d29
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Prtksxna <psax...@wikimedia.org>
Gerrit-Reviewer: Amire80 <amir.ahar...@mail.huji.ac.il>
Gerrit-Reviewer: AndyRussG <andrew.green...@gmail.com>
Gerrit-Reviewer: Prtksxna <psax...@wikimedia.org>
Gerrit-Reviewer: Quiddity <pandiculat...@gmail.com>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to