jenkins-bot has submitted this change and it was merged.
Change subject: i18n: Add missing messages
......................................................................
i18n: Add missing messages
- Fix message key "wikiforum-error-no-text-or-title"
- Add missing "wikiforum-error-*" messages
- Fix indentation
Change-Id: Icd62a82028e8cef4db74cd84110a61fe57c850e9
---
M Category.php
M Forum.php
M i18n/en.json
M i18n/qqq.json
4 files changed, 119 insertions(+), 112 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Category.php b/Category.php
index 8fada7e..1a0d140 100644
--- a/Category.php
+++ b/Category.php
@@ -382,7 +382,7 @@
return $error . WikiForumClass::showOverview();
}
if ( strlen( $categoryName ) == 0 ) {
- $error = WikiForumClass::showErrorMessage(
'wikiforum-error-add', 'wikiforum-no-text-or-title' );
+ $error = WikiForumClass::showErrorMessage(
'wikiforum-error-add', 'wikiforum-error-no-text-or-title' );
return $error . WFCategory::showAddForm();
}
diff --git a/Forum.php b/Forum.php
index f05b73c..2f1caca 100644
--- a/Forum.php
+++ b/Forum.php
@@ -318,7 +318,7 @@
return $error . $this->show();
}
if ( strlen( $forumName ) == 0 ) {
- $error = WikiForumClass::showErrorMessage(
'wikiforum-error-add', 'wikiforum-no-text-or-title' );
+ $error = WikiForumClass::showErrorMessage(
'wikiforum-error-add', 'wikiforum-error-no-text-or-title' );
return $error . $this->showEditForm();
}
diff --git a/i18n/en.json b/i18n/en.json
index 10d6f03..dd501a8 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,121 +1,125 @@
{
- "@metadata": {
- "authors": [
- "Michael Chlebek",
- "Jack Phoenix <[email protected]>",
- "Adam Carter/UltrasonicNXT"
- ]
- },
- "wikiforum-desc": "[[Special:WikiForum|Forum]] extension for MediaWiki",
- "wikiforum": "Discussion board",
- "wikiforum-day-definition-new": "3",
- "wikiforum-max-threads-per-page": "20",
- "wikiforum-max-replies-per-page": "10",
- "wikiforum-anonymous": "Anonymous",
- "wikiforum-announcement-only-description": "Announcement forum (only
moderators can add threads)",
- "wikiforum-by": "On $4 at $5<br />by {{GENDER:$3|$2}}",
- "wikiforum-description": "Description:",
- "wikiforum-forum-is-empty": "This forum is currently empty.\nPlease
contact a forum administrator to have some categories and forums added.",
- "wikiforum-forum-name": "Forum $1",
- "wikiforum-name": "Name:",
- "wikiforum-button-preview": "Preview",
- "wikiforum-preview": "Preview",
- "wikiforum-preview-with-title": "Preview: $1",
- "wikiforum-save": "Save",
- "wikiforum-search-hits": "Found {{PLURAL:$1|one hit|$1 hits}}",
- "wikiforum-search-thread": "Thread: $1",
- "wikiforum-thread-deleted": "thread deleted",
- "wikiforum-topic-name": "Forum - $1",
- "wikiforum-updates": "Newly updated forums",
- "wikiforum-write-thread": "New topic",
- "wikiforum-replies": "Replies",
- "wikiforum-views": "Views",
- "wikiforum-thread": "Thread",
- "wikiforum-threads": "Threads",
- "wikiforum-latest-reply": "Latest reply",
- "wikiforum-latest-thread": "Latest thread",
- "wikiforum-forum": "Forum: $1 > $2",
- "wikiforum-overview": "Overview",
- "wikiforum-pages": "Pages:",
- "wikiforum-thread-closed": "Thread closed",
+ "@metadata": {
+ "authors": [
+ "Michael Chlebek",
+ "Jack Phoenix <[email protected]>",
+ "Adam Carter/UltrasonicNXT"
+ ]
+ },
+ "wikiforum-desc": "[[Special:WikiForum|Forum]] extension for MediaWiki",
+ "wikiforum": "Discussion board",
+ "wikiforum-day-definition-new": "3",
+ "wikiforum-max-threads-per-page": "20",
+ "wikiforum-max-replies-per-page": "10",
+ "wikiforum-anonymous": "Anonymous",
+ "wikiforum-announcement-only-description": "Announcement forum (only
moderators can add threads)",
+ "wikiforum-by": "On $4 at $5<br />by {{GENDER:$3|$2}}",
+ "wikiforum-description": "Description:",
+ "wikiforum-forum-is-empty": "This forum is currently empty.\nPlease
contact a forum administrator to have some categories and forums added.",
+ "wikiforum-forum-name": "Forum $1",
+ "wikiforum-name": "Name:",
+ "wikiforum-button-preview": "Preview",
+ "wikiforum-preview": "Preview",
+ "wikiforum-preview-with-title": "Preview: $1",
+ "wikiforum-save": "Save",
+ "wikiforum-search-hits": "Found {{PLURAL:$1|one hit|$1 hits}}",
+ "wikiforum-search-thread": "Thread: $1",
+ "wikiforum-thread-deleted": "thread deleted",
+ "wikiforum-topic-name": "Forum - $1",
+ "wikiforum-updates": "Newly updated forums",
+ "wikiforum-write-thread": "New topic",
+ "wikiforum-replies": "Replies",
+ "wikiforum-views": "Views",
+ "wikiforum-thread": "Thread",
+ "wikiforum-threads": "Threads",
+ "wikiforum-latest-reply": "Latest reply",
+ "wikiforum-latest-thread": "Latest thread",
+ "wikiforum-forum": "Forum: $1 > $2",
+ "wikiforum-overview": "Overview",
+ "wikiforum-pages": "Pages:",
+ "wikiforum-thread-closed": "Thread closed",
- "wikiforum-new-thread": "New thread",
- "wikiforum-edit-thread": "Edit thread",
- "wikiforum-delete-thread": "Delete thread",
- "wikiforum-close-thread": "Close thread",
- "wikiforum-reopen-thread": "Reopen thread",
- "wikiforum-write-reply": "Write a reply",
- "wikiforum-edit-reply": "Edit reply",
- "wikiforum-delete-reply": "Delete reply",
- "wikiforum-save-thread": "Save thread",
- "wikiforum-save-reply": "Save reply",
- "wikiforum-thread-title": "Title of your thread",
- "wikiforum-no-threads": "No threads are available at the moment.",
+ "wikiforum-new-thread": "New thread",
+ "wikiforum-edit-thread": "Edit thread",
+ "wikiforum-delete-thread": "Delete thread",
+ "wikiforum-close-thread": "Close thread",
+ "wikiforum-reopen-thread": "Reopen thread",
+ "wikiforum-write-reply": "Write a reply",
+ "wikiforum-edit-reply": "Edit reply",
+ "wikiforum-delete-reply": "Delete reply",
+ "wikiforum-save-thread": "Save thread",
+ "wikiforum-save-reply": "Save reply",
+ "wikiforum-thread-title": "Title of your thread",
+ "wikiforum-no-threads": "No threads are available at the moment.",
- "wikiforum-posted": "Posted by {{GENDER:$3|$2}} on $4 at $5.",
- "wikiforum-edited": "Edited by {{GENDER:$3|$2}} on $4 at $5.",
+ "wikiforum-posted": "Posted by {{GENDER:$3|$2}} on $4 at $5.",
+ "wikiforum-edited": "Edited by {{GENDER:$3|$2}} on $4 at $5.",
- "wikiforum-cat-not-found": "Category not found",
- "wikiforum-cat-not-found-text": "Category does not exist",
- "wikiforum-forum-not-found": "Forum not found",
- "wikiforum-forum-not-found-text": "Forum does not exist",
- "wikiforum-thread-not-found": "Thread not found",
- "wikiforum-thread-not-found-text": "Thread does not exist or has been
deleted",
- "wikiforum-reply-not-found": "Reply not found",
- "wikiforum-reply-not-found-text": "Reply does not exist.",
+ "wikiforum-cat-not-found": "Category not found",
+ "wikiforum-cat-not-found-text": "Category does not exist",
+ "wikiforum-forum-not-found": "Forum not found",
+ "wikiforum-forum-not-found-text": "Forum does not exist",
+ "wikiforum-thread-not-found": "Thread not found",
+ "wikiforum-thread-not-found-text": "Thread does not exist or has been
deleted",
+ "wikiforum-reply-not-found": "Reply not found",
+ "wikiforum-reply-not-found-text": "Reply does not exist.",
- "wikiforum-error-thread-reopen": "Error while reopening thread",
- "wikiforum-error-thread-close": "Error while closing thread",
- "wikiforum-error-general": "Object not found or no rights to perform
this action.",
- "wikiforum-error-no-rights": "You don't have the rights to perform this
action.",
- "wikiforum-error-not-found": "Object not found.",
- "wikiforum-error-no-text-or-title": "Title or text not correctly filled
out.",
- "wikiforum-error-bad-title": "The title supplied contained invalid
characters.",
- "wikiforum-error-no-reply": "Reply not correctly filled out.",
- "wikiforum-error-double-post": "You've already posted this reply!",
- "wikiforum-error-thread-closed": "Thread is currently closed. It's not
possible to add a new reply here.",
- "wikiforum-error-title-already-exists": "A thread already exists with
the specified title, please choose another.",
+ "wikiforum-error-thread-reopen": "Error while reopening thread",
+ "wikiforum-error-thread-close": "Error while closing thread",
+ "wikiforum-error-general": "Object not found or no rights to perform this
action.",
+ "wikiforum-error-no-rights": "You don't have the rights to perform this
action.",
+ "wikiforum-error-not-found": "Object not found.",
+ "wikiforum-error-no-text-or-title": "Title or text not correctly filled
out.",
+ "wikiforum-error-bad-title": "The title supplied contained invalid
characters.",
+ "wikiforum-error-no-reply": "Reply not correctly filled out.",
+ "wikiforum-error-double-post": "You've already posted this reply!",
+ "wikiforum-error-thread-closed": "Thread is currently closed. It's not
possible to add a new reply here.",
+ "wikiforum-error-title-already-exists": "A thread already exists with the
specified title, please choose another.",
- "wikiforum-error-readonly": "The database has been marked as read-only,
you may not perform any write actions at the moment.",
- "wikiforum-error-search-missing-query": "You must supply a term to
search for!",
- "wikiforum-error-search": "Search error",
- "wikiforum-error-delete": "Error while deleting",
- "wikiforum-error-sticky": "Error while changing sticky attribute",
- "wikiforum-error-move-thread": "Error while moving thread",
- "wikiforum-error-add": "Error while adding",
- "wikiforum-error-edit": "Error while editing",
- "wikiforum-error-write": "Error while writing",
+ "wikiforum-error-readonly": "The database has been marked as read-only,
you may not perform any write actions at the moment.",
+ "wikiforum-error-search-missing-query": "You must supply a term to search
for!",
+ "wikiforum-error-search": "Search error",
+ "wikiforum-error-delete": "Error while deleting",
+ "wikiforum-error-sticky": "Error while changing sticky attribute",
+ "wikiforum-error-move-thread": "Error while moving thread",
+ "wikiforum-error-add": "Error while adding",
+ "wikiforum-error-edit": "Error while editing",
+ "wikiforum-error-write": "Error while writing",
- "wikiforum-add-category": "Add category",
- "wikiforum-edit-category": "Edit category",
- "wikiforum-delete-category": "Delete category",
- "wikiforum-add-forum": "Add forum",
- "wikiforum-edit-forum": "Edit forum",
- "wikiforum-delete-forum": "Delete forum",
- "wikiforum-sort-up": "sort up",
- "wikiforum-sort-down": "sort down",
- "wikiforum-remove-sticky": "Remove sticky",
- "wikiforum-make-sticky": "Make sticky",
- "wikiforum-move-thread": "Move thread",
- "wikiforum-paste-thread": "Paste thread",
- "wikiforum-quote": "Quote",
+ "wikiforum-error-category": "Category error",
+ "wikiforum-error-forum": "Forum error",
+ "wikiforum-error-thread": "Thread error",
- "right-wikiforum-admin": "Add, edit and delete categories and forums on
[[Special:WikiForum|the discussion board]]",
- "right-wikiforum-moderator": "Edit and delete threads and replies on
[[Special:WikiForum|the discussion board]]",
- "group-forumadmin": "Forum administrators",
- "group-forumadmin-member": "{{GENDER:$1|forum administrator}}",
- "grouppage-forumadmin": "{{ns:project}}:Forum administrators",
- "group-forumadmin.css": "/* CSS placed here will affect forum
administrators only */",
- "group-forumadmin.js": "/* JS placed here will affect forum
administrators only */",
+ "wikiforum-add-category": "Add category",
+ "wikiforum-edit-category": "Edit category",
+ "wikiforum-delete-category": "Delete category",
+ "wikiforum-add-forum": "Add forum",
+ "wikiforum-edit-forum": "Edit forum",
+ "wikiforum-delete-forum": "Delete forum",
+ "wikiforum-sort-up": "sort up",
+ "wikiforum-sort-down": "sort down",
+ "wikiforum-remove-sticky": "Remove sticky",
+ "wikiforum-make-sticky": "Make sticky",
+ "wikiforum-move-thread": "Move thread",
+ "wikiforum-paste-thread": "Paste thread",
+ "wikiforum-quote": "Quote",
- "log-name-forum": "Forum log",
- "log-description-forum": "Logs [[Special:WikiForum|WikiForum]] events",
- "logentry-forum-add-category": "$1 {{GENDER:$2|created}} a new
category, [$4 $5]",
- "logentry-forum-add-forum": "$1 {{GENDER:$2|created}} a new forum, [$4
$5]",
- "logentry-forum-add-thread": "$1 {{GENDER:$2|created}} a new thread,
[[Special:WikiForum/$4|$4]]",
- "logentry-forum-add-reply": "$1 {{GENDER:$2|replied}} on the thread
[[Special:WikiForum/$4|$4]]",
+ "right-wikiforum-admin": "Add, edit and delete categories and forums on
[[Special:WikiForum|the discussion board]]",
+ "right-wikiforum-moderator": "Edit and delete threads and replies on
[[Special:WikiForum|the discussion board]]",
+ "group-forumadmin": "Forum administrators",
+ "group-forumadmin-member": "{{GENDER:$1|forum administrator}}",
+ "grouppage-forumadmin": "{{ns:project}}:Forum administrators",
+ "group-forumadmin.css": "/* CSS placed here will affect forum
administrators only */",
+ "group-forumadmin.js": "/* JS placed here will affect forum administrators
only */",
- "wikiforum-forum-preload": "Title of your forum",
- "wikiforum-category-preload": "Title of your category",
- "wikiforum-must-supply-thread": "You must supply a thread ID"
+ "log-name-forum": "Forum log",
+ "log-description-forum": "Logs [[Special:WikiForum|WikiForum]] events",
+ "logentry-forum-add-category": "$1 {{GENDER:$2|created}} a new category,
[$4 $5]",
+ "logentry-forum-add-forum": "$1 {{GENDER:$2|created}} a new forum, [$4
$5]",
+ "logentry-forum-add-thread": "$1 {{GENDER:$2|created}} a new thread,
[[Special:WikiForum/$4|$4]]",
+ "logentry-forum-add-reply": "$1 {{GENDER:$2|replied}} on the thread
[[Special:WikiForum/$4|$4]]",
+
+ "wikiforum-forum-preload": "Title of your forum",
+ "wikiforum-category-preload": "Title of your category",
+ "wikiforum-must-supply-thread": "You must supply a thread ID"
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 19f6fdb..75f746e 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -79,6 +79,9 @@
"wikiforum-error-move-thread": "Used as heading of error message",
"wikiforum-error-add": "Used as heading of error message",
"wikiforum-error-edit": "Used as heading of error message",
+ "wikiforum-error-category": "Used as heading of error message",
+ "wikiforum-error-forum": "Used as heading of error message",
+ "wikiforum-error-thread": "Used as heading of error message",
"wikiforum-add-category": "Used as link text in categories list
page.\n{{Identical|Add category}}",
"wikiforum-edit-category": "Used as tooltip for edit link, and as page
heading on edit page.\n{{Identical|Edit category}}",
"wikiforum-delete-category": "Used as tooltip for
button.\n{{Identical|Delete category}}",
--
To view, visit https://gerrit.wikimedia.org/r/125960
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icd62a82028e8cef4db74cd84110a61fe57c850e9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikiForum
Gerrit-Branch: master
Gerrit-Owner: Shirayuki <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
