Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/172287
Change subject: Add missing messages for stash errors ...................................................................... Add missing messages for stash errors Bug: 73229 Change-Id: Iee6c478d02c3d6f8d5f7d516c799d9bd53b0272f --- M includes/filebackend/FSFileBackend.php M languages/i18n/en.json M languages/i18n/qqq.json 3 files changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/87/172287/1 diff --git a/includes/filebackend/FSFileBackend.php b/includes/filebackend/FSFileBackend.php index b99ffb6..60f4aa2 100644 --- a/includes/filebackend/FSFileBackend.php +++ b/includes/filebackend/FSFileBackend.php @@ -451,11 +451,11 @@ // Create the directory and its parents as needed... $this->trapWarnings(); if ( !wfMkdirParents( $dir ) ) { - $status->fatal( 'directorycreateerror', $params['dir'] ); // fails on races + $status->fatal( 'directorycreateerror', $dir ); // fails on races } elseif ( !is_writable( $dir ) ) { - $status->fatal( 'directoryreadonlyerror', $params['dir'] ); + $status->fatal( 'directoryreadonlyerror', $dir ); } elseif ( !is_readable( $dir ) ) { - $status->fatal( 'directorynotreadableerror', $params['dir'] ); + $status->fatal( 'directorynotreadableerror', $dir ); } $this->untrapWarnings(); // Respect any 'noAccess' or 'noListing' flags... diff --git a/languages/i18n/en.json b/languages/i18n/en.json index 341f626..0f7705a 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -325,6 +325,8 @@ "filerenameerror": "Could not rename file \"$1\" to \"$2\".", "filedeleteerror": "Could not delete file \"$1\".", "directorycreateerror": "Could not create directory \"$1\".", + "directoryreadonlyerror": "Directory \"$1\" is read-only.", + "directorynotreadableerror": "Directory \"$1\" is not readable.", "filenotfound": "Could not find file \"$1\".", "unexpected": "Unexpected value: \"$1\"=\"$2\".", "formerror": "Error: Could not submit form.", diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json index b9d586c..1cafd20 100644 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@ -489,6 +489,8 @@ "filerenameerror": "Parameters:\n* $1 - old file name\n* $2 - new file name", "filedeleteerror": "Parameters:\n* $1 - file name", "directorycreateerror": "Parameters:\n* $1 - directory name", + "directoryreadonlyerror": "Parameters:\n* $1 - directory name", + "directorynotreadableerror": "Parameters:\n* $1 - directory name", "filenotfound": "Parameters:\n* $1 - file name", "unexpected": "This message indicates the value $2 is unexpected for $1. Parameters:\n* $1 - name\n* $2 - value", "formerror": "Generic error message show to a user when they try to submit information that could not be processed for any reason.", -- To view, visit https://gerrit.wikimedia.org/r/172287 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iee6c478d02c3d6f8d5f7d516c799d9bd53b0272f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Gilles <gdu...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits