From 5fa7fb755034cf14d6a79c5e0a270894375811ac Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Wed, 16 Sep 2015 00:36:02 +0200 Subject: [PATCH] Update UploadWizard-specific messages Merge after I706d76ab4720a94e772d03196c91697d9047f5b9 in UploadWizard. Two messages lost a silly link and $2 parameter: * api-error-duplicate * api-error-duplicate-archive They were both confusingly phrased, as if the link led directly to the file; instead, at least in UploadWizard, clicking on it opened a popup dialog with a list. I don't expect the change to be problematic, the few translations that I understand work equally well with the link removed, and UploadWizard code can now handle both versions. I'm not aware of any uses elsewhere, hopefully this makes the messages less UploadWizard-specific and more reusable. Two messages were removed because they are no longer used in Gerrit extensions:: * api-error-duplicate-archive-popup-title * api-error-duplicate-popup-title Bug: T34606 Change-Id: I9661f24323371f186976df1f5569aba002d4f34e --- languages/i18n/en.json | 6 ++---- languages/i18n/qqq.json | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/languages/i18n/en.json b/languages/i18n/en.json index 12bd910a2d..2b9e40945c 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -3669,10 +3669,8 @@ "api-error-badaccess-groups": "You are not permitted to upload files to this wiki.", "api-error-badtoken": "Internal error: Bad token.", "api-error-copyuploaddisabled": "Uploading by URL is disabled on this server.", - "api-error-duplicate": "There {{PLURAL:$1|is [$2 another file]|are [$2 some other files]}} already on the site with the same content.", - "api-error-duplicate-archive": "There {{PLURAL:$1|was [$2 another file]|were [$2 some other files]}} already on the site with the same content, but {{PLURAL:$1|it was|they were}} deleted.", - "api-error-duplicate-archive-popup-title": "Duplicate {{PLURAL:$1|file that has|files that have}} already been deleted.", - "api-error-duplicate-popup-title": "Duplicate {{PLURAL:$1|file|files}}.", + "api-error-duplicate": "There {{PLURAL:$1|is another file|are some other files}} already on the site with the same content.", + "api-error-duplicate-archive": "There {{PLURAL:$1|was another file|were some other files}} already on the site with the same content, but {{PLURAL:$1|it was|they were}} deleted.", "api-error-empty-file": "The file you submitted was empty.", "api-error-emptypage": "Creating new, empty pages is not allowed.", "api-error-fetchfileerror": "Internal error: Something went wrong while fetching the file.", diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json index 5b80d636af..d40091bd63 100644 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@ -3842,10 +3842,8 @@ "api-error-badaccess-groups": "API error message that can be used for client side localisation of API errors.", "api-error-badtoken": "API error message that can be used for client side localisation of API errors.", "api-error-copyuploaddisabled": "API error message that can be used for client side localisation of API errors.", - "api-error-duplicate": "API error message that can be used for client side localisation of API errors. Parameters:\n* $1 - a number of files\n* $2 - a link to a list of duplicate files", - "api-error-duplicate-archive": "API error message that can be used for client side localisation of API errors. Parameters:\n* $1 - a number of files\n* $2 - a link to a list of duplicate files", - "api-error-duplicate-archive-popup-title": "API error message that can be used for client side localisation of API errors. Parameters:\n* $1 is a number of files.", - "api-error-duplicate-popup-title": "This message is a pop-up title shown in case one or more files exactly equal to the one just uploaded are already present.\n\nThe word \"duplicate\" is an adjective.\n\nParameters:\n* $1 - number of files", + "api-error-duplicate": "API error message that can be used for client side localisation of API errors. Parameters:\n* $1 - a number of files", + "api-error-duplicate-archive": "API error message that can be used for client side localisation of API errors. Parameters:\n* $1 - a number of files", "api-error-empty-file": "API error message that can be used for client side localisation of API errors.", "api-error-emptypage": "API error message that can be used for client side localisation of API errors.", "api-error-fetchfileerror": "API error message that can be used for client side localisation of API errors.", -- 2.20.1