Siebrand has submitted this change and it was merged.
Change subject: i18n: fix spelling "occurred"
......................................................................
i18n: fix spelling "occurred"
Change-Id: Icbf7ff04bfc7599fff02f42ea7c75f89668a51c7
---
M BLUESPICE-RELEASE-NOTES
M i18n/core/en.json
M maintenance/ModifyExportXML.php
M resources/bluespice.extjs/Ext.ux/GMapPanel.js
4 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Siebrand: Verified; Looks good to me, approved
diff --git a/BLUESPICE-RELEASE-NOTES b/BLUESPICE-RELEASE-NOTES
index f0bd531..af9cf9c 100644
--- a/BLUESPICE-RELEASE-NOTES
+++ b/BLUESPICE-RELEASE-NOTES
@@ -27,7 +27,7 @@
* Fix to stay compatible with MW 1.23
* Fixed several bugs in InsertFile in combination with VisualEditor and
getCategoryStoreData
* Now using ExtJS StateManager
-* Fixed a bug in getCategoryStoreData which occured, when a category title
could not be created
+* Fixed a bug in getCategoryStoreData which occurred, when a category title
could not be created
* Fixed bug that categories which did not exist anymore were displayed
* Improved code of CommonAJAXInterface
* Fixed inheritance issues with CRUDGridPanel
diff --git a/i18n/core/en.json b/i18n/core/en.json
index ab76948..7a2f2ed 100644
--- a/i18n/core/en.json
+++ b/i18n/core/en.json
@@ -31,8 +31,8 @@
"bs-userpagesettings-legend": "User settings",
"bs-userpreferences-link-text": "More user settings",
"bs-userpreferences-link-title": "Display your personal user settings",
- "bs-exception-view-heading": "An error occured",
- "bs-exception-view-text": "While processing your request the following
error occured:",
+ "bs-exception-view-heading": "An error occurred",
+ "bs-exception-view-text": "While processing your request the following
error occurred:",
"bs-exception-view-admin-hint": "Please contact your system
administrator.",
"bs-exception-view-stacktrace-toggle-show-text": "Show error details",
"bs-exception-view-stacktrace-toggle-hide-text": "Hide error details",
diff --git a/maintenance/ModifyExportXML.php b/maintenance/ModifyExportXML.php
index d01d6c9..99de8fa 100644
--- a/maintenance/ModifyExportXML.php
+++ b/maintenance/ModifyExportXML.php
@@ -87,7 +87,7 @@
//$vWrittenBytes = file_put_contents( $sOutputFilePath,
html_entity_decode( $sXML ) );
if( $vWrittenBytes === false ){
- echo 'An error occured. Output file could not be
saved.'."\n";
+ echo 'An error occurred. Output file could not be
saved.'."\n";
}
else {
echo 'Success. '.$vWrittenBytes.' Bytes have been
written to "'.$sOutputFilePath.'".'."\n";
diff --git a/resources/bluespice.extjs/Ext.ux/GMapPanel.js
b/resources/bluespice.extjs/Ext.ux/GMapPanel.js
index 8213f2d..03e1fd5 100644
--- a/resources/bluespice.extjs/Ext.ux/GMapPanel.js
+++ b/resources/bluespice.extjs/Ext.ux/GMapPanel.js
@@ -77,7 +77,7 @@
onLookupComplete: function(data, response, marker){
if (response != 'OK') {
- Ext.MessageBox.alert('Error', 'An error occured: "' + response +
'"');
+ Ext.MessageBox.alert('Error', 'An error occurred: "' + response +
'"');
return;
}
this.createMap(data[0].geometry.location, marker);
--
To view, visit https://gerrit.wikimedia.org/r/124501
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icbf7ff04bfc7599fff02f42ea7c75f89668a51c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Shirayuki <[email protected]>
Gerrit-Reviewer: Mglaser <[email protected]>
Gerrit-Reviewer: Pigpen <[email protected]>
Gerrit-Reviewer: Robert Vogel <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: Smuggli <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
