Skip to content

Commit

Permalink
ui: permissions: adjust naming 2
Browse files Browse the repository at this point in the history
[#87606962]
  • Loading branch information
eins78 committed Feb 18, 2015
1 parent 15e8d33 commit 46def14
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 6 deletions.
6 changes: 5 additions & 1 deletion app/assets/javascripts/i18n/locale/de-CH.js
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,10 @@ window.i18n.locale_data = {
null,
"Metadaten editieren"
],
"Edit metadata and add to Set": [
null,
"Metadaten editieren & Inhalte zu Set hinzufügen"
],
"Edit metadata of these media entries": [
null,
"Metadaten von Medieneinträgen editieren"
Expand Down Expand Up @@ -431,7 +435,7 @@ window.i18n.locale_data = {
],
"Get full size": [
null,
"Original exportieren und in PDF blättern"
"Original exportieren & in PDF blättern"
],
"External users": [
null,
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/i18n/locale/en-GB.js
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ window.i18n.locale_data = {
],
"Edit metadata": [
null,
"Edit metadata"
"Edit metadata and add to Set"
],
"Edit metadata of these media entries": [
null,
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/views/permissions/index.tmpl.haml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
%td.ui-rights-role-title ${_jed('Permission')}
%td.ui-rights-check-title ${_jed('Get metadata and previews')}
%td.ui-rights-check-title ${_jed('Get full size')}
%td.ui-rights-check-title ${_jed('Edit metadata')}
%td.ui-rights-check-title ${_jed('Edit metadata and add to Set')}
%td.ui-rights-check-title ${_jed('Edit permissions')}

%tbody
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/views/permissions/line.tmpl.haml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@
{{tmpl({permission: download, label: "Get full size", name: "download"}, {manageable: $item.manageable}) App.renderPath("permissions/line/right-check")}}
{{tmpl({permission: edit, label: "Edit metadata", name: "edit"}, {manageable: $item.manageable}) App.renderPath("permissions/line/right-check")}}
{{tmpl({permission: edit, label: "Edit metadata and add to Set", name: "edit"}, {manageable: $item.manageable}) App.renderPath("permissions/line/right-check")}}
{{tmpl({permission: manage, label: "Edit permissions", name: "manage"}, {manageable: $item.manageable}) App.renderPath("permissions/line/right-check")}}
2 changes: 1 addition & 1 deletion app/views/permissions/edit.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
%h2.title-l.ui-info-box-title Ihre Berechtigungen
%p.ui-info-box-intro Sie, #{current_user}, haben gegenwärtig als Person oder als Mitglied einer Gruppe folgende Berechtigungen
%ul.inline
- action_map= {view: "Get metadata and previews", download: "Get full size", edit: "Edit metadata" , manage: "Edit permissions"}
- action_map= {view: "Get metadata and previews", download: "Get full size", edit: "Edit metadata and add to Set", manage: "Edit permissions"}
- [:view, :download, :edit, :manage].each do |action|
- if @media_resources.accessible_by_user(current_user,action).count == @media_resources.count
%li<>
Expand Down
5 changes: 4 additions & 1 deletion locale/de_CH/madek.po
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,9 @@ msgstr "Filterset editieren"
msgid "Edit metadata"
msgstr "Metadaten editieren"

msgid "Edit metadata and add to Set"
msgstr "Metadaten editieren & Inhalte zu Set hinzufügen"

msgid "Edit metadata of these media entries"
msgstr "Metadaten von Medieneinträgen editieren"

Expand Down Expand Up @@ -290,7 +293,7 @@ msgid "Export"
msgstr "Exportieren"

msgid "Get full size"
msgstr "Original exportieren und in PDF blättern"
msgstr "Original exportieren & in PDF blättern"

msgid "External users"
msgstr "Externe"
Expand Down
3 changes: 3 additions & 0 deletions locale/en_GB/madek.po
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,9 @@ msgstr "Edit filter set"
msgid "Edit metadata"
msgstr "Edit metadata"

msgid "Edit metadata"
msgstr "Edit metadata and add to Set"

msgid "Edit metadata of these media entries"
msgstr "Edit metadata of these media entries"

Expand Down

0 comments on commit 46def14

Please sign in to comment.