Fix some I18n

pull/1068/head
Till Breuer 11 years ago
parent e882ba9b28
commit 83baa29b2e
  1. 4
      app/assets/javascripts/angular/directives/components/icon-wrapper-directive.js
  2. 6
      app/assets/javascripts/angular/directives/components/toggled-multiselect-directive.js
  3. 3
      app/assets/javascripts/angular/directives/work_packages/query-filter-directive.js
  4. 4
      app/assets/javascripts/angular/directives/work_packages/work-packages-loading-directive.js
  5. 1
      config/locales/js-de.yml
  6. 1
      config/locales/js-en.yml
  7. 4
      public/templates/components/icon_wrapper.html
  8. 4
      public/templates/components/toggled_multiselect.html
  9. 2
      public/templates/work_packages/query_filters.html

@ -1,11 +1,11 @@
// TODO move to UI components
angular.module('openproject.uiComponents')
.directive('iconWrapper', ['I18n', function(I18n){
.directive('iconWrapper', [function(){
return {
restrict: 'EA',
replace: true,
scope: { iconName: '@', title: '=iconTitle' },
scope: { iconName: '@', title: '@iconTitle' },
templateUrl: '/templates/components/icon_wrapper.html'
};
}]);

@ -1,17 +1,19 @@
// TODO move to UI components
angular.module('openproject.uiComponents')
.directive('toggledMultiselect', ['WorkPackagesHelper', function(WorkPackagesHelper){
.directive('toggledMultiselect', ['WorkPackagesHelper', 'I18n', function(WorkPackagesHelper, I18n){
return {
restrict: 'EA',
replace: true,
scope: {
name: '=',
values: '=',
availableOptions: '=',
availableOptions: '='
},
templateUrl: '/templates/components/toggled_multiselect.html',
link: function(scope, element, attributes){
scope.I18n = I18n;
scope.toggleMultiselect = function(){
scope.isMultiselect = !scope.isMultiselect;
};

@ -6,7 +6,8 @@ angular.module('openproject.workPackages.directives')
restrict: 'A',
scope: true,
link: function(scope, element, attributes) {
scope.isLoading = false; // don't shadow isLoading as its used for a different purpose in this context
scope.I18n = I18n;
scope.isLoading = false; // shadow isLoading as its used for a different purpose in this context
scope.showValueOptionsAsSelect = ['list', 'list_optional', 'list_status', 'list_subprojects', 'list_model'].indexOf(scope.query.getFilterType(scope.filter.name)) !== -1;

@ -5,8 +5,6 @@ angular.module('openproject.workPackages.directives')
return {
restrict: 'E',
templateUrl: '/templates/work_packages/work_packages_loading.html',
scope: true,
link: function(scope, element, attributes) {
}
scope: true
};
}]);

@ -4,6 +4,7 @@ de:
hide: "Verbergen"
loading: "Lädt ..."
button_check_all: "Alles auswählen"
button_delete: "Löschen"
button_uncheck_all: "Alles abwählen"
description_available_columns: "Verfügbare Spalten"
description_select_work_package: "Arbeitspaket auswählen"

@ -4,6 +4,7 @@ en:
hide: "Hide"
loading: "Loading ..."
button_check_all: "Check all"
button_delete: "Delete"
button_uncheck_all: "Uncheck all"
description_available_columns: "Available Columns"
description_select_work_package: "Select work package"

@ -1,3 +1,3 @@
<span class="icon-context icon-button icon-{{iconName}}">
<span class="hidden-for-sighted"></span>
<span class="icon-context icon-button icon-{{iconName}}" title="{{title}}">
<span class="hidden-for-sighted">{{title}}</span>
</span>

@ -22,8 +22,8 @@
<option ng-repeat="value in availableOptions" value="{{ value[1] }}" ng-selected="isSelected(value[1])">{{ value[0] }}</option>
</select>
<a alt="Toggle multiselect" href="#" class="no-decoration-on-hover" title="Toggle multiselect" ng-click="toggleMultiselect()">
<a href="#" class="no-decoration-on-hover" title="{{I18n.t('js.work_packages.label_enable_multi_select')}}" ng-click="toggleMultiselect()">
<icon-wrapper icon-name="plus"
icon-title="I18n.t('js.work_packages.label_enable_multi_select')"/>
icon-title="{{I18n.t('js.work_packages.label_enable_multi_select')}}"/>
</a>
</div>

@ -142,7 +142,7 @@
<!-- Delete filter -->
<td>
<icon-wrapper icon-name="delete2"
icon-title="'delete'"
icon-title="{{I18n.t('js.button_delete')}}"
ng-click="query.deactivateFilter(filter, loading)"/>
<!-- TODO I18n -->
</td>

Loading…
Cancel
Save