Skip to content

Commit

Permalink
Extract and translate strings.
Browse files Browse the repository at this point in the history
Translate title in file show page.

Translate "Depositor" in file show page.

Translate fields in file show page.

Case problem

Translate actions in file show page.

Translate "sort and per page" for collections show view in back office

Translate "sort and per page" for collections show view in front office

Translate title in "sort and per page" for collections show view in front office

Page crashes in french because of missing entries in i18n file

Fix test failing with "translation missing: en.hyrax.collections.sort_and_per_page.html.erb.sort_by_html"

Translate "choose file" in collection branding tab

Translate delete banner controls in collection branding tab

Translate second "choose file" in collection branding tab

Translate "link url" in collection branding tab

Translate "alt text", "link url", "previous" in collection branding tab

Translate search controles in collection sharing tab

Translate roles in collection sharing tab

Fix test failing with "translation missing: en.hyrax.collections.sort_and_per_page.html.erb.sort_by_html"

German translations improvements
  • Loading branch information
joachim.dornbusch@ehess.fr committed Feb 21, 2019
1 parent bf2e4c8 commit f24a2c2
Show file tree
Hide file tree
Showing 16 changed files with 276 additions and 35 deletions.
6 changes: 3 additions & 3 deletions app/views/hyrax/collections/_sort_and_per_page.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<%= render 'view_type_group' %>
<fieldset class="pull-left">
<legend class="sr-only"><%= t('hyrax.sort_label') %></legend>
<%= label_tag(:sort, '<span>Sort by:</span>'.html_safe) %>
<%= label_tag(:sort, t('.sort_by_html')) %>
<%= select_tag(:sort, options_from_collection_for_select(active_sort_fields, 'first', lambda {|field| field.last.label}, h(params[:sort]))) %>
<%= label_tag(:per_page) do %>
<span class="tiny-nudge">Results per page:</span>
<%= select_tag(:per_page, options_for_select(['10', '20', '50', '100'], h(params[:per_page])), title: "Number of results to display per page") %>
<span class="tiny-nudge"><%= t('.results_per_page') %></span>
<%= select_tag(:per_page, options_for_select(['10', '20', '50', '100'], h(params[:per_page])), title: t('.number_of_results_to_display_per_page')) %>
<% end %>
<%= render_hash_as_hidden_fields(search_state.params_for_search.except(:per_page, :sort)) %>
&nbsp;<button class="btn btn-xs btn-default tiny-nudge"><span class="glyphicon glyphicon-refresh"></span> Refresh</button>
Expand Down
20 changes: 10 additions & 10 deletions app/views/hyrax/dashboard/collections/_form_branding.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<!-- The fileinput-button span is used to style the file input field as button -->
<span class="btn btn-success fileinput-button">
<span class="glyphicon glyphicon-plus"></span>
<span>Choose File</span>
<span><%= t('.choose_file') %></span>
<input type="file" name="files[]" single />
</span>
</div> <!-- end col-xs-4 -->
Expand Down Expand Up @@ -47,10 +47,10 @@
<div class="col-sm-2">
<button class="btn btn-danger delete branding-banner-remove" data-type="DELETE" data-url="/" onclick=$("#banner").remove();>
<span class="glyphicon glyphicon-remove"></span>
<span class="controls-remove-text">Remove</span>
<span class="controls-remove-text"><%= t('.remove') %></span>
<span class="sr-only">
previous
<span class="controls-field-name-text">Remove Current Banner</span>
<%= t('.previous') %>
<span class="controls-field-name-text"><%= t('.remove_current_banner') %></span>
</span>
</button>
</div> <!-- end col-sm-2 -->
Expand Down Expand Up @@ -92,7 +92,7 @@
<!-- The fileinput-button span is used to style the file input field as button -->
<span class="btn btn-success fileinput-button">
<span class="glyphicon glyphicon-plus"></span>
<span>Choose File</span>
<span><%= t('.choose_file') %></span>
<input type="file" name="files[]" single />
</span>
</div> <!-- end col-xs-4 -->
Expand Down Expand Up @@ -122,21 +122,21 @@
</div>

<div class="col-sm-4 branding-logo-input">
<label for="linkurl_<%= i %>">Link URL:
<label for="linkurl_<%= i %>"><%= t('.link_url') %>
<input id="linkurl_<%= i %>" class="branding-logo-input" type="text" name="linkurl[]" value="<%= linfo[:linkurl] %>" />
</label>
<label for="alttext_<%= i %>">Alt Text:
<label for="alttext_<%= i %>"><%= t('.alt_text') %>
<input id="alttext_<%= i %>" class="branding-logo-input" type="text" name="alttext[]" value="<%= linfo[:alttext] %>" />
</label>
</div>

<div class="col-sm-2">
<button class="btn btn-danger delete branding-logo-remove" data-type="DELETE" data-url="/" onclick=$("#logorow_<%= i %>").remove();>
<span class="glyphicon glyphicon-remove"></span>
<span class="controls-remove-text">Remove</span>
<span class="controls-remove-text"><%= t('.remove') %></span>
<span class="sr-only">
previous
<span class="controls-field-name-text">Remove Logo <%= i + 1 %></span>
<%= t('.previous') %>
<span class="controls-field-name-text"><%= t('.remove_logo') %> <%= i + 1 %></span>
</span>
</button>
</div> <!-- end col-sm-2 -->
Expand Down
10 changes: 5 additions & 5 deletions app/views/hyrax/dashboard/collections/_form_share.html.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% access_options = options_for_select([['Manager', 'manage'], ['Depositor', 'deposit'], ['Viewer', 'view']]) %>
<% access_options = options_for_select([[t('.manager'), 'manage'], [t('.depositor'), 'deposit'], [t('.viewer'), 'view']]) %>

<div id="participants" class="tab-pane">
<div class="edit-sharing-tab">
Expand All @@ -21,14 +21,14 @@
<label><%= t('.add_group') %>:</label>
<%= builder.hidden_field :agent_type %>
<%= builder.text_field :agent_id,
placeholder: "Search for a group...",
placeholder: t('.search_for_a_group'),
class: 'form-control search-input' %>
</div>
<div class="form-group">
<label>as</label>
<%= builder.select :access,
access_options,
{ prompt: "Select a role..." },
{ prompt: t('.select_a_role') },
class: 'form-control' %>
</div>
<% end %>
Expand All @@ -53,13 +53,13 @@
<label><%= t('.add_user') %>:</label>
<%= builder.hidden_field :agent_type %>
<%= builder.text_field :agent_id,
placeholder: "Search for a user..." %>
placeholder: t('.search_for_a_user') %>
</div>
<div class="form-group">
<label>as</label>
<%= builder.select :access,
access_options,
{ prompt: "Select a role..." },
{ prompt: t('.select_a_role') },
class: 'form-control' %>
</div>
<% end %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@
<div class="form-group form-group-lg">
<fieldset class="col-sm-9">
<legend class="sr-only"><%= t('hyrax.sort_label') %></legend>
<%= label_tag(:sort, 'Sort By:') %>
<%= label_tag(:sort, t(".sort_by")) %>
<%= select_tag(:sort, options_from_collection_for_select(active_sort_fields, 'first', lambda {|field| field.last.label}, h(params[:sort]))) %>
<%= label_tag(:per_page) do %>
Show <%= select_tag(:per_page, options_for_select(['10', '20', '50', '100'], params[:per_page]), title: t('hyrax.dashboard.my.sr.results_per_page')) %>
per page
<%= t(".show_par_page_html", select: select_tag(:per_page, options_for_select(['10', '20', '50', '100'], params[:per_page]), title: t('hyrax.dashboard.my.sr.results_per_page'))) %>
<% end %>
<%= render_hash_as_hidden_fields(search_state.params_for_search.except(:per_page, :sort)) %>
<button class="btn btn-info"><span class="glyphicon glyphicon-refresh"></span> <%= t('helpers.action.refresh') %></button>
Expand Down
8 changes: 4 additions & 4 deletions app/views/hyrax/file_sets/_show_actions.html.erb
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<div class="form-actions">
<% if Hyrax.config.analytics? %>
<%= link_to "Analytics", @presenter.stats_path, id: 'stats', class: 'btn btn-default' %>
<%= link_to t('.analytics'), @presenter.stats_path, id: 'stats', class: 'btn btn-default' %>
<% end %>
<% if @presenter.editor? %>
<%= link_to "Edit This #{@presenter.human_readable_type}", edit_polymorphic_path([main_app, @presenter]),
<%= link_to t(".edit_this", type: @presenter.human_readable_type), edit_polymorphic_path([main_app, @presenter]),
class: 'btn btn-default' %>
<%= link_to "Delete This #{@presenter.human_readable_type}", [main_app, @presenter],
class: 'btn btn-danger', data: { confirm: "Delete this #{@presenter.human_readable_type}?" },
<%= link_to t(".delete_this", type: @presenter.human_readable_type), [main_app, @presenter],
class: 'btn btn-danger', data: { confirm: t(".confirm_delete_this", type: @presenter.human_readable_type) },
method: :delete %>
<% end %>
Expand Down
14 changes: 7 additions & 7 deletions app/views/hyrax/file_sets/_show_details.html.erb
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<h2>File Details</h2>
<h2><%= t(".file_details") %></h2>
<dl class="dl-horizontal file-show-term file-show-details">
<dt>Depositor</dt>
<dt><%= t(".depositor") %></dt>
<dd itemprop="accountablePerson" itemscope itemtype="http://schema.org/Person"><span itemprop="name"><%= link_to_profile @presenter.depositor %></span></dd>
<dt>Date Uploaded</dt>
<dt><%= t(".date_uploaded") %></dt>
<dd itemprop="datePublished"><%= @presenter.date_uploaded %></dd>
<dt>Date Modified</dt>
<dt><%= t(".date_modified") %></dt>
<dd itemprop="dateModified"><%= @presenter.date_modified %></dd>
<dt>Fixity Check</dt>
<dt><%= t(".fixity_check") %></dt>
<dd><%= @presenter.fixity_check_status %></dd>
<dt>Characterization</dt>
<dt><%= t(".characterization") %></dt>
<dd>
<% if @presenter.characterized? %>
<%= render 'show_characterization_details' %>
<% else %>
not yet characterized
<%= t(".not_yet_characterized") %>
<% end %>
</dd>
</dl>
2 changes: 1 addition & 1 deletion app/views/hyrax/users/_vitals.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="list-group-item">
<span class="glyphicon glyphicon-time" aria-hidden="true"></span> Joined on <%= user.created_at.to_date.strftime("%b %d, %Y") %>
<span class="glyphicon glyphicon-time" aria-hidden="true"></span> <%= t("hyrax.dashboard.stats.joined_on") %> <%= user.created_at.to_date.strftime("%b %d, %Y") %>
</div>

<div class="list-group-item">
Expand Down
34 changes: 34 additions & 0 deletions config/locales/hyrax.de.yml
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,10 @@ de:
show_more_parent_collections: Zeig mehr...
subcollection_count: Untergeordnete Sammlungen
works_in_collection: Arbeiten in dieser Sammlung
sort_and_per_page:
number_of_results_to_display_per_page: Anzahl der Ergebnisse die pro Seite angezeigt werden
results_per_page: 'Ergebnisse pro Seite:'
sort_by_html: "<span>Sortieren nach:</span>"
contact_form:
button_label: Senden
email_label: Ihre E-Mail
Expand Down Expand Up @@ -598,15 +602,22 @@ de:
relationships: Beziehungen
sharing: Freigaben
form_branding:
alt_text: 'Alternativer Linktext:'
banner:
description: Ein Bild, das am oberen Rand der Sammlungsseite angezeigt werden soll. Für beste Ergebnisse laden Sie ein Bild (JPG, GIF oder PNG) hoch, das mindestens 120 Pixel groß und 1200 Pixel breit ist.
label: Banner
branding:
description: Optional können Sie ein Bannerbild und / oder Logo-Bilder hochladen, die mit dieser Sammlung verknüpft werden sollen. Wenn diese hochgeladen werden, werden diese Bilder oben auf der Sammlungsseite angezeigt, um ein eindeutiges Markenbildung für die Sammlung bereitzustellen.
label: Markenbildung
choose_file: "Datei" wählen
link_url: 'URL-Link:'
logo:
description: Ein oder mehrere Bilder, die oben auf der Sammlungsseite angezeigt werden. Für beste Ergebnisse laden Sie ein Bild (JPG, GIF oder PNG) hoch, das 40 Pixel hoch ist. Größere Bilder werden auf 40 Pixel in der Höhe angepasst.
label: Logo
previous: Vorherig
remove: Entfernen
remove_current_banner: Aktuelles Banner entfernen
remove_logo: Logo entfernen
form_discovery:
para1: Diese Einstellungen legen fest, wer die Einstiegsseite dieser Sammlung ermitteln und ansehen kann. Sie haben keinen Einfluss auf die Sichtbarkeit von Elementen in der Sammlung.
para2: Wenn Sie diese Sammlung nicht öffnen möchten, können Sie die Sammlung weiterhin für bestimmte Benutzer und Gruppen freigeben, indem Sie die Registerkarte Freigaben verwenden.
Expand All @@ -633,7 +644,13 @@ de:
add_sharing: Freigaben hinzufügen
add_user: Benutzer hinzufügen
current_shared: Derzeit freigegeben für
depositor: Deponent
manager: Manager
note: Unabhängig von den Sichtbarkeitseinstellungen dieser Sammlung können Sie diese Sammlung für bestimmte Gruppen und Benutzer freigeben.
search_for_a_group: Eine Gruppe suchen...
search_for_a_user: Einen Benutzer suchen...
select_a_role: Wählen Sie eine Rolle...
viewer: Betrachter
form_share_table:
allow_all_registered: Erlaube alle registrierten
depositors:
Expand Down Expand Up @@ -674,6 +691,9 @@ de:
show_less_parent_collections: "...zeige weniger"
show_more_parent_collections: Zeig mehr...
subcollection_count: Untersammlungen
sort_and_per_page:
show_par_page_html: Zeige %{select} pro Seite
sort_by: 'Sortieren nach:'
create_work: Arbeiten erstellen
current_proxies: Aktuelle Vertreter
delete_notification: Benachrichtigung löschen
Expand Down Expand Up @@ -797,6 +817,7 @@ de:
file_views: Aussicht
files: Dateien deponiert
heading: Ihre Statistik
joined_on: Beigetreten am
works: Arbeiten erstellt
title: Mein Dashboard
transfer_of_ownership: Eigentumsübertragungen
Expand Down Expand Up @@ -897,6 +918,19 @@ de:
table_title_access: Zugriffsebene
table_title_user: Person / Gruppe
user_search: Nach einem Benutzer suchen
show_actions:
analytics: Statistik
confirm_delete_this: %{type} löschen?
delete_this: Löschen %{type}
edit_this: %{type} bearbeiten
show_details:
characterization: Charakterisierung
date_modified: Letztes Änderungsdatum
date_uploaded: Hochlade-Datum
depositor: Deponent
file_details: Dateidetails
fixity_check: Beständigkeit überprüfen
not_yet_characterized: Noch nicht charakterisiert
versioning:
current: Aktuelle Version
header: Versionen
Expand Down
34 changes: 34 additions & 0 deletions config/locales/hyrax.en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,10 @@ en:
show_more_parent_collections: show more...
subcollection_count: Subcollections
works_in_collection: Works
sort_and_per_page:
number_of_results_to_display_per_page: Number of results to display per page
results_per_page: 'Results per page:'
sort_by_html: "<span>Sort by:</span>"
contact_form:
button_label: Send
email_label: Your Email
Expand Down Expand Up @@ -604,15 +608,22 @@ en:
relationships: Relationships
sharing: Sharing
form_branding:
alt_text: 'Alt Text:'
banner:
description: An image to be displayed at the top of the collection page. For best results, upload an image (JPG, GIF or PNG) that is at least 120 pixels tall and 1200 pixels wide.
label: Banner
branding:
description: Optionally, you can upload a banner image and/or logo images to associate with this collection. If uploaded, these images will be displayed at the top of the collection page to provide unique branding for the collection.
label: Branding
choose_file: Choose File
link_url: 'Link URL:'
logo:
description: One or more images to be displayed at the top of the collection page. For best results, upload an image (JPG, GIF or PNG) that is 40 pixels in height. Larger images will be resized to 40 pixels in height.
label: Logo
previous: Previous
remove: Remove
remove_current_banner: Remove Current Banner
remove_logo: Remove Logo
form_discovery:
para1: These settings determine who is able to discover and view this collection's landing page; they do not affect the visibility of items in the collection.
para2: If you chose not to make this collection open access, you can still share the collection with specific users and groups using the Sharing tab.
Expand All @@ -639,7 +650,13 @@ en:
add_sharing: Add Sharing
add_user: Add user
current_shared: Currently Shared With
depositor: Depositor
manager: Manager
note: Regardless of the visibility settings of this collection, you can share this collection with specific groups and users.
search_for_a_group: Search for a group...
search_for_a_user: Search for a user...
select_a_role: Select a role...
viewer: Viewer
form_share_table:
allow_all_registered: Allow all registered
depositors:
Expand Down Expand Up @@ -680,6 +697,9 @@ en:
show_less_parent_collections: "...show less"
show_more_parent_collections: show more...
subcollection_count: Subcollections
sort_and_per_page:
show_par_page_html: Show %{select} per page
sort_by: 'Sort By:'
create_work: Create Work
current_proxies: Current Proxies
delete_notification: Delete Notification
Expand Down Expand Up @@ -803,6 +823,7 @@ en:
file_views: View
files: Files deposited
heading: Your Statistics
joined_on: Joined on
works: Works created
title: Dashboard
transfer_of_ownership: Transfers of Ownership
Expand Down Expand Up @@ -903,6 +924,19 @@ en:
table_title_access: Access Level
table_title_user: Person/Group
user_search: Search for a user
show_actions:
analytics: Analytics
confirm_delete_this: Delete this %{type}?
delete_this: Delete this %{type}
edit_this: Edit this %{type}
show_details:
characterization: Characterization
date_modified: Date Modified
date_uploaded: Date Uploaded
depositor: Depositor
file_details: File Details
fixity_check: Fixity Check
not_yet_characterized: Not Yet Characterized
versioning:
current: Current Version
header: Versions
Expand Down
Loading

0 comments on commit f24a2c2

Please sign in to comment.