diff --git a/.gitignore b/.gitignore index c9b8ca7..f20460e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,5 @@ artifacts/ src/packages/*/** build/App_plugins/ build/bin/ -assets/ \ No newline at end of file +assets/ +src/Our.Umbraco.NestedContent/Settings.StyleCop diff --git a/src/Our.Umbraco.NestedContent/Properties/VersionInfo.cs b/src/Our.Umbraco.NestedContent/Properties/VersionInfo.cs index 96a08b4..8fd2b63 100644 --- a/src/Our.Umbraco.NestedContent/Properties/VersionInfo.cs +++ b/src/Our.Umbraco.NestedContent/Properties/VersionInfo.cs @@ -14,6 +14,6 @@ using System.Runtime.InteropServices; [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyInformationalVersion("1.0.0-local-000100")] +[assembly: AssemblyInformationalVersion("1.0.6-beta")] diff --git a/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Js/nestedcontent.controllers.js b/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Js/nestedcontent.controllers.js index f2ac033..62982e7 100644 --- a/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Js/nestedcontent.controllers.js +++ b/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Js/nestedcontent.controllers.js @@ -55,14 +55,34 @@ angular.module("umbraco").controller("Our.Umbraco.NestedContent.Controllers.Nest "$filter", "contentResource", "Our.Umbraco.NestedContent.Resources.NestedContentResources", + "localizationService", - function ($scope, $interpolate, $filter, contentResource, ncResources) { + function ($scope, $interpolate, $filter, contentResource, ncResources, localizationService) { //$scope.model.config.contentTypes; //$scope.model.config.minItems; //$scope.model.config.maxItems; //console.log($scope); + $scope.editIconTitle = ''; + $scope.moveIconTitle = ''; + $scope.deleteIconTitle = ''; + + // localize the edit icon title + localizationService.localize('general_edit').then(function (value) { + $scope.editIconTitle = value; + }); + + // localize the delete icon title + localizationService.localize('general_delete').then(function (value) { + $scope.deleteIconTitle = value; + }); + + // localize the move icon title + localizationService.localize('actions_move').then(function (value) { + $scope.moveIconTitle = value; + }); + var inited = false; _.each($scope.model.config.contentTypes, function (contentType) { diff --git a/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Views/nestedcontent.html b/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Views/nestedcontent.html index 5781bc9..5c7c0c5 100644 --- a/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Views/nestedcontent.html +++ b/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Views/nestedcontent.html @@ -12,13 +12,13 @@