diff --git a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.controller.js
index 5b9626c676ff..f69467b0a1d7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.controller.js
@@ -1,3 +1,4 @@
+
(function () {
"use strict";
@@ -13,6 +14,12 @@
vm.customDashboard = null;
vm.tours = [];
vm.systemInfoDisplay = false;
+ vm.labels = {};
+ vm.labels.copiedSuccessInfo = "";
+ vm.labels.copySuccessStatus = "";
+ vm.labels.copiedErrorInfo = "";
+ vm.labels.copyErrorStatus = "";
+
vm.closeDrawer = closeDrawer;
vm.startTour = startTour;
@@ -36,6 +43,24 @@
localizationService.localize("general_help").then(function(data){
vm.title = data;
});
+ //Set help dashboard messages
+ var labelKeys = [
+ "general_help",
+ "speechBubbles_copySuccessMessage",
+ "general_success",
+ "speechBubbles_cannotCopyInformation",
+ "general_error"
+ ];
+ localizationService.localizeMany(labelKeys).then(function(resp){
+ [
+ vm.title,
+ vm.labels.copiedSuccessInfo,
+ vm.labels.copySuccessStatus,
+ vm.labels.copiedErrorInfo,
+ vm.labels.copyErrorStatus
+ ] = resp;
+ });
+
currentUserResource.getUserData().then(function(systemInfo){
vm.systemInfo = systemInfo;
let browserInfo = platformService.getBrowserInfo();
@@ -43,7 +68,7 @@
vm.systemInfo.push({name :"Browser", data: browserInfo.name + " " + browserInfo.version});
}
vm.systemInfo.push({name :"Browser OS", data: getPlatform()});
- });
+ } );
tourService.getGroupedTours().then(function(groupedTours) {
vm.tours = groupedTours;
getTourGroupCompletedPercentage();
@@ -208,22 +233,33 @@
}
}
function copyInformation(){
- let copyText = "\n\n\n\nCategory | Data\n-- | --\n";
+ //Write start and end text for table formatting in github issues
+ let copyStartText = "\n\n\n\nCategory | Data\n-- | --\n";
+ let copyEndText = "\n\n\n";
+
+ let copyText = copyStartText;
vm.systemInfo.forEach(function (info){
copyText += info.name + " | " + info.data + "\n";
});
- copyText += "\n\n\n"
- navigator.clipboard.writeText(copyText);
- if(copyText != null){
- notificationsService.success("Copied!", "Your system information is now in your clipboard");
+
+ copyText += copyEndText;
+
+ // Check if copyText is only start + end text
+ // if it is something went wrong and we will not copy to clipboard
+ let emptyCopyText = copyStartText + copyEndText;
+ if(copyText !== emptyCopyText) {
+ notificationsService.success(vm.labels.copySuccessStatus, vm.labels.copiedSuccessInfo);
+ navigator.clipboard.writeText(copyText);
}
- else{
- notificationsService.error("Error", "Could not copy system information");
+ else {
+ notificationsService.error(vm.labels.copyErrorStatus, vm.labels.copiedErrorInfo);
}
}
+
function getPlatform() {
return window.navigator.platform;
}
+
evts.push(eventsService.on("appState.tour.complete", function (event, tour) {
tourService.getGroupedTours().then(function(groupedTours) {
vm.tours = groupedTours;
@@ -239,8 +275,8 @@
});
oninit();
-
}
angular.module("umbraco").controller("Umbraco.Drawers.Help", HelpDrawerController);
+
})();
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index 7e29e6b9784f..1f50e3ebca63 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -1395,6 +1395,8 @@ Mange hilsner fra Umbraco robotten
Der er ikke noget domæne konfigureret for %0%, kontakt vensligst en
administrator, se loggen for mere information
+ Dit systems information er blevet kopieret til udklipsholderen
+ Kunne desværre ikke kopiere dit systems information til udklipsholderen
Tilføj style
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 707bb5631558..d148a405581d 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -1572,6 +1572,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
There is no domain configured for %0%, please contact an administrator, see
log for more information
+ Your system information has successfully been copied to the clipboard
+ Could not copy your system information to the clipboard
Add style
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index dbe779223402..ab41c6af5473 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -1615,6 +1615,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
There is no domain configured for %0%, please contact an administrator, see
log for more information
+ Your system information has successfully been copied to the clipboard
+ Could not copy your system information to the clipboard
Add style