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

Fix edit content localization errors (#3840)

Browse Source 
* Fix wrongly formatted localizations

* Swap hardcoded time format for a localized one

* Split date and time in publish messages
This commit is contained in:
Kenn Jacobsen
2018-12-07 14:17:34 +01:00
committed by Sebastiaan Janssen
parent 7fc69e5eb0
commit fb094f46be
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI/umbraco/config/lang/da.xml
View File

@@ -1079,10 +1079,10 @@ Mange hilsner fra Umbraco robotten
<key alias="dictionaryItemSaved">Ordbogsnøgle gemt</key>
<key alias="editContentPublishedHeader">Indhold publiceret</key>
<key alias="editContentPublishedText">og nu synligt for besøgende</key>
<key alias="editContentPublishedWithExpireDateText">og nu synligt for besøgende indtil {0}</key>
<key alias="editContentPublishedWithExpireDateText">og nu synligt for besøgende indtil %0% kl. %1%</key>
<key alias="editContentSavedHeader">Indhold gemt</key>
<key alias="editContentSavedText">Husk at publicere for at gøre det synligt for besøgende</key>
<key alias="editContentSavedWithReleaseDateText">Ændringerne bliver publiceret den {0}</key>
<key alias="editContentSavedWithReleaseDateText">Ændringerne bliver publiceret den %0% kl. %1%</key>
<key alias="editContentSendToPublish">Send til Godkendelse</key>
<key alias="editContentSendToPublishText">Rettelser er blevet sendt til godkendelse</key>
<key alias="editMediaSaved">Medie gemt</key>

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

@@ -1397,10 +1397,10 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="editContentPublishedFailedByParent">Publishing failed because the parent page isn't published</key>
<key alias="editContentPublishedHeader">Content published</key>
<key alias="editContentPublishedText">and visible on the website</key>
<key alias="editContentPublishedWithExpireDateText">and visible on the website until {0}</key>
<key alias="editContentPublishedWithExpireDateText">and visible on the website until %0% at %1%</key>
<key alias="editContentSavedHeader">Content saved</key>
<key alias="editContentSavedText">Remember to publish to make changes visible</key>
<key alias="editContentSavedWithReleaseDateText">Changes will be published on {0}</key>
<key alias="editContentSavedWithReleaseDateText">Changes will be published on %0% at %1%</key>
<key alias="editContentSendToPublish">Sent For Approval</key>
<key alias="editContentSendToPublishText">Changes have been sent for approval</key>
<key alias="editMediaSaved">Media saved</key>

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

@@ -1396,10 +1396,10 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="editContentPublishedFailedByParent">Publishing failed because the parent page isn't published</key>
<key alias="editContentPublishedHeader">Content published</key>
<key alias="editContentPublishedText">and visible on the website</key>
<key alias="editContentPublishedWithExpireDateText">and visible on the website until {0}</key>
<key alias="editContentPublishedWithExpireDateText">and visible on the website until %0% at %1%</key>
<key alias="editContentSavedHeader">Content saved</key>
<key alias="editContentSavedText">Remember to publish to make changes visible</key>
<key alias="editContentSavedWithReleaseDateText">Changes will be published on {0}</key>
<key alias="editContentSavedWithReleaseDateText">Changes will be published on %0% at %1%</key>
<key alias="editContentSendToPublish">Sent For Approval</key>
<key alias="editContentSendToPublishText">Changes have been sent for approval</key>
<key alias="editMediaSaved">Media saved</key>

6
src/Umbraco.Web/Editors/ContentController.cs
View File

@@ -697,8 +697,7 @@ namespace Umbraco.Web.Editors
display.AddSuccessNotification(
Services.TextService.Localize("speechBubbles/editContentSavedHeader"),
contentItem.ReleaseDate.HasValue
? string.Format(Services.TextService.Localize("speechBubbles/editContentSavedWithReleaseDateText"),
$"{contentItem.ReleaseDate.Value.ToLongDateString()} {contentItem.ReleaseDate.Value.ToString("HH:mm")}")
? Services.TextService.Localize("speechBubbles/editContentSavedWithReleaseDateText", new [] { contentItem.ReleaseDate.Value.ToLongDateString(), contentItem.ReleaseDate.Value.ToShortTimeString() })
: Services.TextService.Localize("speechBubbles/editContentSavedText")
);
}
@@ -1053,8 +1052,7 @@ namespace Umbraco.Web.Editors
display.AddSuccessNotification(
Services.TextService.Localize("speechBubbles/editContentPublishedHeader"),
expireDate.HasValue
? string.Format(Services.TextService.Localize("speechBubbles/editContentPublishedWithExpireDateText"),
$"{expireDate.Value.ToLongDateString()} {expireDate.Value.ToString("HH:mm")}")
? Services.TextService.Localize("speechBubbles/editContentPublishedWithExpireDateText", new [] { expireDate.Value.ToLongDateString(), expireDate.Value.ToShortTimeString() })
: Services.TextService.Localize("speechBubbles/editContentPublishedText")
);
break;