[MediaWiki-commits] [Gerrit] mediawiki...FileAnnotations[master]: Localisation message tweaks

2016-09-19 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Localisation message tweaks
..


Localisation message tweaks

* Remove unused message 'fileannotations-file-has-annotations'
  (unused since 86bf6483b1f523df5ad751930225e1429ac2749a).
* Add missing qqq documentation for API help messages.
* Correct qqq documentation for the description message.

Bug: T142069
Change-Id: I8b2ba6a1664721045445f30e44ac5ca7930f2ce9
---
M extension.json
M i18n/en.json
M i18n/qqq.json
3 files changed, 4 insertions(+), 8 deletions(-)

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



diff --git a/extension.json b/extension.json
index e2adb42..93bcbba 100644
--- a/extension.json
+++ b/extension.json
@@ -58,7 +58,6 @@
 
"messages": [
"fileannotations-create",
-   "fileannotations-file-has-annotations",
"fileannotations-save",
"fileannotations-cancel",
"fileannotations-edit",
diff --git a/i18n/en.json b/i18n/en.json
index 786f46a..46a26a0 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3,18 +3,14 @@
"authors": []
},
"fileannotations-desc": "Displays and edits annotations on file pages.",
-   "fileannotations-file-has-annotations": "There are annotations on this 
file. Mouse over the image to view them.",
"fileannotations-tab": "Annotations",
"fileannotations-create": "Add file annotation",
"fileannotations-save": "Save",
"fileannotations-cancel": "Cancel",
"fileannotations-edit": "Edit",
"fileannotations-delete": "Delete",
-
"fileannotations-commons-see-more": "See more images",
-
"fileannotations-go-to-filepage": "It is recommended that you view and 
edit file annotations on [[:$1|the file page]], where they are available in a 
visual format.",
-
"apihelp-query+fileannotations-description": "Fetch wikitext and 
optionally HTML for annotations on a file on the wiki.",
"apihelp-query+fileannotations-param-parse": "Whether to fetch the 
parsed annotations. Could take longer with many, large, or complex annotations."
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 8b6d536..a256535 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -2,8 +2,7 @@
"@metadata": {
"authors": []
},
-   "fileannotations-desc": "Description of the FileAnnotations extension.",
-   "fileannotations-file-has-annotations": "Note on file page indicating 
the file has annotations.",
+   "fileannotations-desc": 
"{{desc|name=FileAnnotations|url=https://www.mediawiki.org/wiki/Extension:FileAnnotations}}";,
"fileannotations-tab": "Text for a tab that links to the file 
annotations page from the file page.",
"fileannotations-create": "Text of a button to create a new annotation 
on a file.",
"fileannotations-save": "Text of a button to save a new or edited 
annotation.",
@@ -11,5 +10,7 @@
"fileannotations-edit": "Text of a button to begin editing an 
annotation.",
"fileannotations-delete": "Text of a button to delete an annotation.",
"fileannotations-commons-see-more": "Shown on an annotation that is a 
Commons category, allows the user to go to the category page to see more 
images.",
-   "fileannotations-go-to-filepage": "Appears on the file annotations page 
to encourage users to go to the file page to interact with the content. $1 is 
the file page title, including namespace, suitable for inclusion in a wikilink. 
The message will be parsed. Remember to put a colon (:) in front of the file 
page title, or the message will put the whole image into the page."
+   "fileannotations-go-to-filepage": "Appears on the file annotations page 
to encourage users to go to the file page to interact with the content. $1 is 
the file page title, including namespace, suitable for inclusion in a wikilink. 
The message will be parsed. Remember to put a colon (:) in front of the file 
page title, or the message will put the whole image into the page.",
+   "apihelp-query+fileannotations-description": 
"{{doc-apihelp-description|query+fileannotations}}",
+   "apihelp-query+fileannotations-param-parse": 
"{{doc-apihelp-param|query+fileannotations|parse}}"
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8b2ba6a1664721045445f30e44ac5ca7930f2ce9
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/FileAnnotations
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: MarkTraceur 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits m

[MediaWiki-commits] [Gerrit] mediawiki...FileAnnotations[master]: Localisation message tweaks

2016-09-12 Thread Code Review
Bartosz Dziewoński has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/310073

Change subject: Localisation message tweaks
..

Localisation message tweaks

* Make message keys consistent. Update usages.
* Remove unused message 'file-has-annotations'
  (unused since 86bf6483b1f523df5ad751930225e1429ac2749a).
* Add missing qqq documentation for API help messages.
* Correct qqq documentation for the description message.

Bug: T142069
Change-Id: I8b2ba6a1664721045445f30e44ac5ca7930f2ce9
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M resources/src/fileannotations.js
4 files changed, 24 insertions(+), 27 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FileAnnotations 
refs/changes/73/310073/1

diff --git a/extension.json b/extension.json
index dbde3c7..b673417 100644
--- a/extension.json
+++ b/extension.json
@@ -57,12 +57,11 @@
],
 
"messages": [
-   "fileannotation-create",
-   "file-has-annotations",
-   "save-fileannotation",
-   "cancel-fileannotation",
-   "edit-fileannotation",
-   "delete-fileannotation"
+   "fileannotations-create",
+   "fileannotations-save",
+   "fileannotations-cancel",
+   "fileannotations-edit",
+   "fileannotations-delete"
]
}
},
diff --git a/i18n/en.json b/i18n/en.json
index 9b7a627..b18c840 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3,16 +3,13 @@
"authors": []
},
"fileannotations-desc": "Displays and edits annotations on file pages.",
-   "file-has-annotations": "There are annotations on this file. Mouse over 
the image to view them.",
"fileannotations-tab": "Annotations",
-   "fileannotation-create": "Add file annotation",
-   "save-fileannotation": "Save",
-   "cancel-fileannotation": "Cancel",
-   "edit-fileannotation": "Edit",
-   "delete-fileannotation": "Delete",
-
+   "fileannotations-create": "Add file annotation",
+   "fileannotations-save": "Save",
+   "fileannotations-cancel": "Cancel",
+   "fileannotations-edit": "Edit",
+   "fileannotations-delete": "Delete",
"fileannotations-go-to-filepage": "It is recommended that you view and 
edit file annotations on [[:$1|the file page]], where they are available in a 
visual format.",
-
"apihelp-query+fileannotations-description": "Fetch wikitext and 
optionally HTML for annotations on a file on the wiki.",
"apihelp-query+fileannotations-param-parse": "Whether to fetch the 
parsed annotations. Could take longer with many, large, or complex annotations."
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 4dedd17..5c6004d 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -2,13 +2,14 @@
"@metadata": {
"authors": []
},
-   "fileannotations-desc": "Description of the FileAnnotations extension.",
-   "file-has-annotations": "Note on file page indicating the file has 
annotations.",
+   "fileannotations-desc": 
"{{desc|name=FileAnnotations|url=https://www.mediawiki.org/wiki/Extension:FileAnnotations}}";,
"fileannotations-tab": "Text for a tab that links to the file 
annotations page from the file page.",
-   "fileannotation-create": "Text of a button to create a new annotation 
on a file.",
-   "save-fileannotation": "Text of a button to save a new or edited 
annotation.",
-   "cancel-fileannotation": "Text of a button that cancels creating or 
editing an annotation.",
-   "edit-fileannotation": "Text of a button to begin editing an 
annotation.",
-   "delete-fileannotation": "Text of a button to delete an annotation.",
-   "fileannotations-go-to-filepage": "Appears on the file annotations page 
to encourage users to go to the file page to interact with the content. $1 is 
the file page title, including namespace, suitable for inclusion in a wikilink. 
The message will be parsed. Remember to put a colon (:) in front of the file 
page title, or the message will put the whole image into the page."
+   "fileannotations-create": "Text of a button to create a new annotation 
on a file.",
+   "fileannotations-save": "Text of a button to save a new or edited 
annotation.",
+   "fileannotations-cancel": "Text of a button that cancels creating or 
editing an annotation.",
+   "fileannotations-edit": "Text of a button to begin editing an 
annotation.",
+   "fileannotations-delete": "Text of a button to delete an annotation.",
+   "fileannotations-go-to-filepage": "Appears on the file annotations page 
to encoura