jenkins-bot has submitted this change and it was merged.
Change subject: Message adjustments for editing posts.
......................................................................
Message adjustments for editing posts.
Previously, when you edited a post and clicked "Preview", you would
have two "Edit" buttons next to one another, one which meant
"keep editing" and one which meant "Save changes".
I've changed the keep editing button to actually say "Keep editing"
and the save button to actually say "Save changes".
Change-Id: I5c51dc45430e75b03900a61c71d5419391dd77c0
---
M Resources.php
M handlebars/flow_edit_post.handlebars
M i18n/en.json
M i18n/qqq.json
M modules/new/components/flow-board.js
5 files changed, 10 insertions(+), 5 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Resources.php b/Resources.php
index be9656a..1352106 100644
--- a/Resources.php
+++ b/Resources.php
@@ -75,6 +75,7 @@
'flow-post-action-delete-post',
'flow-post-action-undelete-post',
'flow-post-action-edit-post',
+ 'flow-post-action-edit-post-submit',
'flow-post-action-hide-post',
'flow-post-action-unhide-post',
'flow-post-action-post-history',
@@ -82,6 +83,7 @@
'flow-post-action-suppress-post',
'flow-post-action-unsuppress-post',
'flow-post-action-restore-post',
+ "flow-preview-return-edit-post",
'flow-preview',
'flow-recent-topics',
'flow-reply-submit',
diff --git a/handlebars/flow_edit_post.handlebars
b/handlebars/flow_edit_post.handlebars
index 7986667..a52393e 100644
--- a/handlebars/flow_edit_post.handlebars
+++ b/handlebars/flow_edit_post.handlebars
@@ -17,7 +17,7 @@
<div class="flow-form-actions flow-form-collapsible">
<button class="flow-ui-button flow-ui-constructive"
data-flow-api-handler="submitEditPost">
- {{~l10n "flow-post-action-edit-post"~}}
+ {{~l10n "flow-post-action-edit-post-submit"~}}
</button>
{{previewButton "flow_post"}}
<button class="flow-ui-button flow-ui-destructive flow-ui-quiet"
diff --git a/i18n/en.json b/i18n/en.json
index dd866e8..71f4b44 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -71,6 +71,7 @@
"flow-post-action-delete-post": "Delete",
"flow-post-action-hide-post": "Hide",
"flow-post-action-edit-post": "Edit",
+ "flow-post-action-edit-post-submit": "Save changes",
"flow-post-action-unsuppress-post": "Unsuppress",
"flow-post-action-undelete-post": "Undelete",
"flow-post-action-unhide-post": "Unhide",
@@ -334,6 +335,7 @@
"flow-special-uuid": "UUID",
"flow-special-invalid-uuid": "Could not find content matching the type and
the UUID.",
"flow-spam-confirmedit": "As an anonymous user, you can't submit external
links. Please sign up for an account.",
- "flow-preview-warning": "You are seeing a preview. Submit the form to
finish posting this, or click edit to continue writing.",
+ "flow-preview-warning": "You are seeing a preview. Submit the form to
finish posting this, or click \"Keep editing\" to continue writing.",
+ "flow-preview-return-edit-post" : "Keep editing",
"flow-anonymous": "Anonymous"
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index b97c718..386519c 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -73,6 +73,7 @@
"flow-post-action-delete-post": "Used as a link in a dropdown menu to
delete a post.\n{{Related|Flow-action}}\n{{Identical|Delete}}",
"flow-post-action-hide-post": "Used as a link in a dropdown menu to
hide a post.\n{{Related|Flow-action}}\n{{Identical|Hide}}",
"flow-post-action-edit-post": "Used as text for the link which is used
to edit the post.\n{{Related|Flow-action}}\n{{Identical|Edit}}",
+ "flow-post-action-edit-post-submit" : "Used as text for a button to
submit an 'edit post' form.\n{{Related|flow-post-action-edit-post}}",
"flow-post-action-unsuppress-post": "Used as a link in a dropdown menu
to unsuppress a post.\n{{Related|Flow-action}}\n{{Identical|Unsuppress}}",
"flow-post-action-undelete-post": "Used as a link in a dropdown menu to
undelete a post.\n{{Related|Flow-action}}\n{{Identical|Undelete}}",
"flow-post-action-unhide-post": "Used as a link in a dropdown menu to
unhide a post.\n{{Related|Flow-action}}\n{{Identical|Unhide}}",
@@ -338,6 +339,6 @@
"flow-sorting-tooltip": "Tooltip displayed when mouse hovering over the
sorting drop down menu",
"flow-toggle-small-topics": "Tooltip displayed when mouse hovering over
the full page topic collapser. When clicked only topic titles are displayed.",
"flow-toggle-topics": "Tooltip displayed when mouse hovering over the
full page topic collapser. When clicked posts are not displayed, only topic
titles and metadata are visible.",
- "flow-toggle-topics-posts": "Tooltip displayed when mouse hovering over
the full page topic collapser. When clicked posts will be displayed with topic
titles."
-
+ "flow-toggle-topics-posts": "Tooltip displayed when mouse hovering over
the full page topic collapser. When clicked posts will be displayed with topic
titles.",
+ "flow-preview-return-edit-post" : "Used as text for a button that hides
previewed text and returns to the editing view"
}
diff --git a/modules/new/components/flow-board.js
b/modules/new/components/flow-board.js
index c7dd85c..b683603 100644
--- a/modules/new/components/flow-board.js
+++ b/modules/new/components/flow-board.js
@@ -541,7 +541,7 @@
text: $button.text(),
$nodes: $previewContainer
} )
- .text(
flowBoard.TemplateEngine.l10n('flow-post-action-edit-post') );
+ .text(
flowBoard.TemplateEngine.l10n('flow-preview-return-edit-post') );
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/141635
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5c51dc45430e75b03900a61c71d5419391dd77c0
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: frontend-rewrite
Gerrit-Owner: Werdna <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Matthias Mullie <[email protected]>
Gerrit-Reviewer: Werdna <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
