yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1499 from darrenferguson/dev-v7

Browse Source 
U4-9012 The word "Oops" should probably be removed, because we can ca…
This commit is contained in:
Mads Rasmussen
2016-10-13 15:20:59 +02:00
committed by GitHub
parent 7282626c0f 78524398b7
commit a0a861370b
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs
View File

@@ -122,7 +122,7 @@ namespace Umbraco.Core.Persistence.Factories
else if (entity is IMemberType)
nodeObjectType = Constants.ObjectTypes.MemberTypeGuid;
else
throw new Exception("oops: invalid entity.");
throw new Exception("Invalid entity.");
var contentTypeDto = new ContentTypeDto
{

2
src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
View File

@@ -79,7 +79,7 @@ namespace Umbraco.Core.Persistence.Factories
{
// note: no idea why Id is nullable here, but better check
if (groupDto.Id.HasValue == false)
throw new Exception("oops: groupDto.Id has no value.");
throw new Exception("GroupDto.Id has no value.");
group.Id = groupDto.Id.Value;
}

2
src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
View File

@@ -134,7 +134,7 @@ angular.module('umbraco.mocks').
"content_nodeName": "Page Title",
"content_otherElements": "Properties",
"content_parentNotPublished": "This document is published but is not visible because the parent '%0%' is unpublished",
"content_parentNotPublishedAnomaly": "Oops: this document is published but is not in the cache (internal error)",
"content_parentNotPublishedAnomaly": "This document is published but is not in the cache",
"content_publish": "Publish",
"content_publishStatus": "Publication Status",
"content_releaseDate": "Publish at",

6
src/Umbraco.Web.UI/umbraco/config/lang/en.xml
View File

@@ -147,9 +147,9 @@
<key alias="nodeName">Page Title</key>
<key alias="otherElements">Properties</key>
<key alias="parentNotPublished">This document is published but is not visible because the parent '%0%' is unpublished</key>
<key alias="parentNotPublishedAnomaly">Oops: this document is published but is not in the cache (internal error - see log)</key>
<key alias="getUrlException">Oops: could not get the url (internal error - see log)</key>
<key alias="routeError">Oops: this document is published but its url would collide with content %0%</key>
<key alias="parentNotPublishedAnomaly">This document is published but is not in the cache</key>
<key alias="getUrlException">Could not get the url</key>
<key alias="routeError">This document is published but its url would collide with content %0%</key>
<key alias="publish">Publish</key>
<key alias="publishStatus">Publication Status</key>
<key alias="releaseDate">Publish at</key>

6
src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
View File

@@ -148,9 +148,9 @@
<key alias="nodeName">Page Title</key>
<key alias="otherElements">Properties</key>
<key alias="parentNotPublished">This document is published but is not visible because the parent '%0%' is unpublished</key>
<key alias="parentNotPublishedAnomaly">Oops: this document is published but is not in the cache (internal error - see log)</key>
<key alias="getUrlException">Oops: could not get the url (internal error - see log)</key>
<key alias="routeError">Oops: this document is published but its url would collide with content %0%</key>
<key alias="parentNotPublishedAnomaly">This document is published but is not in the cache</key>
<key alias="getUrlException">Could not get the url</key>
<key alias="routeError">This document is published but its url would collide with content %0%</key>
<key alias="publish">Publish</key>
<key alias="publishStatus">Publication Status</key>
<key alias="releaseDate">Publish at</key>

4
src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js
View File

@@ -389,12 +389,12 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
processData: false,
success: function (data, textStatus) {
if (textStatus == "error") {
alert("Oops. Could not update sort order");
alert("Could not update sort order");
self._getChildNodes();
}
},
error: function(data) {
alert("Oops. Could not update sort order. Err: " + data.statusText);
alert("Could not update sort order. Err: " + data.statusText);
self._getChildNodes();
}
});