ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3661 from FinnStutzenstein/improvements

Browse Source 
Fixing translations (fixes #3607, fixes #3604).
This commit is contained in:
Emanuel Schütze 2018-03-19 15:34:06 +01:00 committed by GitHub
commit a8aa366b3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/agenda/static/js/agenda/csv.js
View File

@ -32,7 +32,7 @@ angular.module('OpenSlidesApp.agenda.csv', [])
row.push('"' + (item.is_hidden ? '1' : '') + '"'); row.push('"' + (item.is_hidden ? '1' : '') + '"');
csvRows.push(row); csvRows.push(row);
}); });
CsvDownload(csvRows, 'agenda-export.csv'); CsvDownload(csvRows, gettextCatalog.getString('Agenda') + '.csv');
}, },
}; };
} }

6
openslides/motions/static/js/motions/csv.js
View File

@ -38,7 +38,7 @@ angular.module('OpenSlidesApp.motions.csv', [])
params = {}; params = {};
} }
_.defaults(params, { _.defaults(params, {
filename: 'motions-export.csv', filename: gettextCatalog.getString('motions') + '.csv',
changeRecommendationMode: Config.get('motions_recommendation_text_mode').value, changeRecommendationMode: Config.get('motions_recommendation_text_mode').value,
include: { include: {
text: true, text: true,
@ -101,7 +101,7 @@ angular.module('OpenSlidesApp.motions.csv', [])
csvRows.push(row); csvRows.push(row);
}); });
CsvDownload(csvRows, 'motions-export.csv'); CsvDownload(csvRows, params.filename);
}, },
downloadExample: function () { downloadExample: function () {
var csvRows = [makeHeaderline({ include: { var csvRows = [makeHeaderline({ include: {
@ -118,7 +118,7 @@ angular.module('OpenSlidesApp.motions.csv', [])
['B1', 'Title 2', 'Text 2', 'Reason 2', 'Submitter B', 'Category B', '', 'Block A'], ['B1', 'Title 2', 'Text 2', 'Reason 2', 'Submitter B', 'Category B', '', 'Block A'],
['' , 'Title 3', 'Text 3', '', '', '', '', ''], ['' , 'Title 3', 'Text 3', '', '', '', '', ''],
]; ];
CsvDownload(csvRows, 'motions-example.csv'); CsvDownload(csvRows, gettextCatalog.getString('motions-example') + '.csv');
}, },
}; };
} }

2
openslides/motions/static/js/motions/docx.js
View File

@ -182,7 +182,7 @@ angular.module('OpenSlidesApp.motions.docx', ['OpenSlidesApp.core.docx'])
converter = Html2DocxConverter.createInstance(); converter = Html2DocxConverter.createInstance();
params = _.clone(params || {}); // Clone this to avoid sideeffects. params = _.clone(params || {}); // Clone this to avoid sideeffects.
_.defaults(params, { _.defaults(params, {
filename: 'motions-export.docx', filename: gettextCatalog.getString('motions') + '.docx',
changeRecommendationMode: Config.get('motions_recommendation_text_mode').value, changeRecommendationMode: Config.get('motions_recommendation_text_mode').value,
include: { include: {
text: true, text: true,

2
openslides/topics/static/js/topics/csv.js
View File

@ -23,7 +23,7 @@ angular.module('OpenSlidesApp.topics.csv', [])
['Demo 2', 'Demo text 2', '1:30', '', ''] ['Demo 2', 'Demo text 2', '1:30', '', '']
]; ];
CsvDownload(csvRows, 'agenda-example.csv'); CsvDownload(csvRows, gettextCatalog.getString('agenda-example') + '.csv');
}, },
}; };
} }

4
openslides/users/static/js/users/csv.js
View File

@ -41,7 +41,7 @@ angular.module('OpenSlidesApp.users.csv', [])
row.push('"' + user.email + '"'); row.push('"' + user.email + '"');
csvRows.push(row); csvRows.push(row);
}); });
CsvDownload(csvRows, 'users-export.csv'); CsvDownload(csvRows, gettextCatalog.getString('participants') + '.csv');
}, },
downloadExample: function () { downloadExample: function () {
@ -65,7 +65,7 @@ angular.module('OpenSlidesApp.users.csv', [])
['', '', 'Executive Board', '', '', '', '', '', '', '1', '', ''], ['', '', 'Executive Board', '', '', '', '', '', '', '1', '', ''],
]; ];
CsvDownload(csvRows, 'users-example.csv'); CsvDownload(csvRows, gettextCatalog.getString('participants-example') + '.csv');
} }
}; };
} }

7
openslides/users/static/js/users/site.js
View File

@ -1590,14 +1590,15 @@ angular.module('OpenSlidesApp.users.site', [
'$scope', '$scope',
'Group', 'Group',
'group', 'group',
'gettextCatalog',
'ErrorMessage', 'ErrorMessage',
function($scope, Group, group, ErrorMessage) { function($scope, Group, group, gettextCatalog, ErrorMessage) {
$scope.group = group; $scope.group = group;
$scope.new_name = group.name; $scope.new_name = gettextCatalog.getString(group.name);
$scope.alert = {}; $scope.alert = {};
$scope.save = function() { $scope.save = function() {
var old_name = $scope.group.name; var old_name = gettextCatalog.getString($scope.group.name);
$scope.group.name = $scope.new_name; $scope.group.name = $scope.new_name;
Group.save($scope.group).then( Group.save($scope.group).then(
function (success) { function (success) {

2
openslides/users/static/templates/users/group-edit.html
View File

@ -7,7 +7,7 @@
<form name="groupForm" ng-submit="save()"> <form name="groupForm" ng-submit="save()">
<label for="name_1"> <label for="name_1">
<span ng-if="group"> <span ng-if="group">
<translate>Please enter a new name for {{ group.name }}:</translate> <translate>Please enter a new group name:</translate>
</span> </span>
<span ng-if="!group" translate> <span ng-if="!group" translate>
Please enter a name for the new group: Please enter a name for the new group:

2
openslides/users/static/templates/users/group-list.html
View File

@ -33,7 +33,7 @@
</span> </span>
<i class="fa fa-info-circle" ng-if="group.id == 1" <i class="fa fa-info-circle" ng-if="group.id == 1"
uib-tooltip="{{ 'Users without any assigned group gain the permissions from this group.' | translate }}"></i> uib-tooltip="{{ 'Users without any assigned group gain the permissions from this group.' | translate }}"></i>
<div os-perms="users.can_manage" ng-hide="group.id == 1" class="hoverActions" <div os-perms="users.can_manage" ng-hide="group.id == 1" class="hoverActions text-center"
ng-class="{'hiddenDiv': !group.hover}"> ng-class="{'hiddenDiv': !group.hover}">
<!--edit name--> <!--edit name-->
<a href="" ng-click="openDialog(group)"> <a href="" ng-click="openDialog(group)">