diff --git a/app/models/phase.rb b/app/models/phase.rb index a316416..5c2323f 100644 --- a/app/models/phase.rb +++ b/app/models/phase.rb @@ -4,6 +4,12 @@ # [+Created:+] 03/09/2014 # [+Copyright:+] Digital Curation Centre and University of California Curation Center class Phase < ActiveRecord::Base + + ## + # Sort order: Number ASC + default_scope { order(number: :asc) } + + # extend FriendlyId ## # Associations diff --git a/app/models/question.rb b/app/models/question.rb index 10efc8b..1d45c38 100644 --- a/app/models/question.rb +++ b/app/models/question.rb @@ -1,4 +1,9 @@ class Question < ActiveRecord::Base + + ## + # Sort order: Number ASC + default_scope { order(number: :asc) } + ## # Associations has_many :answers, :dependent => :destroy diff --git a/app/models/user.rb b/app/models/user.rb index 8ea0608..c1350f6 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -263,6 +263,14 @@ end end + ## + # Override devise_invitable email title + # -------------------------------------------------------------- + def deliver_invitation(options = {}) + super(options.merge(subject: _('A Data Management Plan in %{application_name} has been shared with you') % {application_name: Rails.configuration.branding[:application][:name]})) + end + + # TODO: Remove this, its never called. # this generates a reset password link for a given user # which can then be sent to them with the appropriate host diff --git a/app/views/guidance_groups/admin_edit.html.erb b/app/views/guidance_groups/admin_edit.html.erb index 006318b..77146d5 100644 --- a/app/views/guidance_groups/admin_edit.html.erb +++ b/app/views/guidance_groups/admin_edit.html.erb @@ -29,7 +29,7 @@
- <%= link_to(image_tag('help_button.png'), '#', class: 'guidance_group_title_popover', rel: "popover", 'data-html' => "true", 'data-content' => _("Add an appropriate name for your guidance group e.g. Glasgow guidance. This name will be used to tell the end user where the guidance has come from e.g. 'Glasgow Guidance on Metadata'")) %> + <%= link_to(image_tag('help_button.png'), '#', class: 'guidance_group_title_popover', rel: "popover", 'data-html' => "true", 'data-content' => _('Add an appropriate name for your guidance group. This name will be used to tell the end user where the guidance has come from. It will be appended to text identifying the theme e.g. "[guidance group name]: guidance on data sharing" so we suggest you just use the institution or department name.')) %>
@@ -75,4 +75,4 @@
<% end %> - \ No newline at end of file + diff --git a/app/views/guidance_groups/admin_new.html.erb b/app/views/guidance_groups/admin_new.html.erb index faf81f8..8ea92b8 100644 --- a/app/views/guidance_groups/admin_new.html.erb +++ b/app/views/guidance_groups/admin_new.html.erb @@ -25,7 +25,7 @@ <%= f.text_field :name, as: :string, class: "text_field" %>
- <%= link_to( image_tag("help_button.png"), "#", class: 'guidance_group_title_popover', rel: "popover", 'data-html' => "true", 'data-content' => _("Add an appropriate name for your guidance group e.g. Glasgow guidance. This name will be used to tell the end user where the guidance has come from e.g. 'Glasgow Guidance on Metadata'"))%> + <%= link_to( image_tag("help_button.png"), "#", class: 'guidance_group_title_popover', rel: "popover", 'data-html' => "true", 'data-content' => _('Add an appropriate name for your guidance group. This name will be used to tell the end user where the guidance has come from. It will be appended to text identifying the theme e.g. "[guidance group name]: guidance on data sharing" so we suggest you just use the institution or department name.'))%>
diff --git a/config/locale/app.pot b/config/locale/app.pot index 960a80d..f51cfec 100644 --- a/config/locale/app.pot +++ b/config/locale/app.pot @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: app 1.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-02 19:14+0100\n" -"PO-Revision-Date: 2017-06-02 19:14+0100\n" +"POT-Creation-Date: 2017-06-06 12:18+0100\n" +"PO-Revision-Date: 2017-06-06 12:18+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -207,6 +207,9 @@ "

Email %{organisation_email}

" msgstr "" +msgid "A Data Management Plan in %{application_name} has been shared with you" +msgstr "" + msgid "A colleague has invited you to contribute to their Data Management Plan at " msgstr "" @@ -243,7 +246,7 @@ msgid "Actions" msgstr "" -msgid "Add an appropriate name for your guidance group e.g. Glasgow guidance. This name will be used to tell the end user where the guidance has come from e.g. 'Glasgow Guidance on Metadata'" +msgid "Add an appropriate name for your guidance group. This name will be used to tell the end user where the guidance has come from. It will be appended to text identifying the theme e.g. \"[guidance group name]: guidance on data sharing\" so we suggest you just use the institution or department name." msgstr "" msgid "Add collaborator" diff --git a/config/locale/de/app.po b/config/locale/de/app.po index bbc0715..82a56da 100644 --- a/config/locale/de/app.po +++ b/config/locale/de/app.po @@ -224,6 +224,10 @@ msgstr "DMPonline" #, fuzzy +msgid "A Data Management Plan in %{application_name} has been shared with you" +msgstr "DMPonline" + +#, fuzzy msgid "A colleague has invited you to contribute to their Data Management Plan at " msgstr "A colleague has invited you to contribute to their Data Management Plan at" @@ -260,8 +264,9 @@ msgid "Actions" msgstr "Aktionen" -msgid "Add an appropriate name for your guidance group e.g. Glasgow guidance. This name will be used to tell the end user where the guidance has come from e.g. 'Glasgow Guidance on Metadata'" -msgstr "Geben Sie einen geeigneten Namen für Ihre Hilfestellungsgruppe ein, wie z.B. 'CAU Hilfestellungen'. Dieser Name soll den Nutzern vermitteln, woher die Hilfestellung kommt, z.B. 'CAU Hilfestellung zu Metadaten'" +#, fuzzy +msgid "Add an appropriate name for your guidance group. This name will be used to tell the end user where the guidance has come from. It will be appended to text identifying the theme e.g. \"[guidance group name]: guidance on data sharing\" so we suggest you just use the institution or department name." +msgstr "Hilfestellungsgruppe" msgid "Add collaborator" msgstr "Mitarbeitende(n) hinzufügen" diff --git a/config/locale/en_GB/app.po b/config/locale/en_GB/app.po index f35d162..ce40929 100644 --- a/config/locale/en_GB/app.po +++ b/config/locale/en_GB/app.po @@ -216,6 +216,10 @@ "

Email %{organisation_email}

" msgstr "%{application_name}" +#, fuzzy +msgid "A Data Management Plan in %{application_name} has been shared with you" +msgstr "%{application_name}" + msgid "A colleague has invited you to contribute to their Data Management Plan at " msgstr "A colleague has invited you to contribute to their Data Management Plan at " @@ -252,8 +256,9 @@ msgid "Actions" msgstr "Actions" -msgid "Add an appropriate name for your guidance group e.g. Glasgow guidance. This name will be used to tell the end user where the guidance has come from e.g. 'Glasgow Guidance on Metadata'" -msgstr "Add an appropriate name for your guidance group e.g. Glasgow guidance. This name will be used to tell the end user where the guidance has come from e.g. 'Glasgow Guidance on Metadata'" +#, fuzzy +msgid "Add an appropriate name for your guidance group. This name will be used to tell the end user where the guidance has come from. It will be appended to text identifying the theme e.g. \"[guidance group name]: guidance on data sharing\" so we suggest you just use the institution or department name." +msgstr "guidance group" msgid "Add collaborator" msgstr "Add collaborator" diff --git a/config/locale/en_US/app.po b/config/locale/en_US/app.po index 3bae78c..d582337 100644 --- a/config/locale/en_US/app.po +++ b/config/locale/en_US/app.po @@ -216,6 +216,10 @@ "

Email %{organisation_email}

" msgstr "%{application_name}" +#, fuzzy +msgid "A Data Management Plan in %{application_name} has been shared with you" +msgstr "%{application_name}" + msgid "A colleague has invited you to contribute to their Data Management Plan at " msgstr "A colleague has invited you to contribute to their Data Management Plan at " @@ -252,8 +256,9 @@ msgid "Actions" msgstr "Actions" -msgid "Add an appropriate name for your guidance group e.g. Glasgow guidance. This name will be used to tell the end user where the guidance has come from e.g. 'Glasgow Guidance on Metadata'" -msgstr "Add an appropriate name for your guidance group e.g. Glasgow guidance. This name will be used to tell the end user where the guidance has come from e.g. 'Glasgow Guidance on Metadata'" +#, fuzzy +msgid "Add an appropriate name for your guidance group. This name will be used to tell the end user where the guidance has come from. It will be appended to text identifying the theme e.g. \"[guidance group name]: guidance on data sharing\" so we suggest you just use the institution or department name." +msgstr "guidance group" msgid "Add collaborator" msgstr "Add collaborator" diff --git a/config/locale/es/app.po b/config/locale/es/app.po index 55298f2a..ed322cb 100644 --- a/config/locale/es/app.po +++ b/config/locale/es/app.po @@ -220,6 +220,10 @@ "

Email %{organisation_email}

" msgstr "DMPonline" +#, fuzzy +msgid "A Data Management Plan in %{application_name} has been shared with you" +msgstr "DMPonline" + msgid "A colleague has invited you to contribute to their Data Management Plan at " msgstr "" @@ -256,8 +260,9 @@ msgid "Actions" msgstr "Acciones" -msgid "Add an appropriate name for your guidance group e.g. Glasgow guidance. This name will be used to tell the end user where the guidance has come from e.g. 'Glasgow Guidance on Metadata'" -msgstr "Añada un nombre adecuado para el grupo de su guía (Ej: Guía de Glasgow). Este nombre se usará para indicar a los usuarios finales la procedencia de la guía (Ej: 'Guía de metadatos de Glasgow')" +#, fuzzy +msgid "Add an appropriate name for your guidance group. This name will be used to tell the end user where the guidance has come from. It will be appended to text identifying the theme e.g. \"[guidance group name]: guidance on data sharing\" so we suggest you just use the institution or department name." +msgstr "Grupo de orientación" msgid "Add collaborator" msgstr "Añadir colaborador" diff --git a/config/locale/fr/app.po b/config/locale/fr/app.po index 5fb2580..98bad88 100644 --- a/config/locale/fr/app.po +++ b/config/locale/fr/app.po @@ -219,6 +219,10 @@ "

Email %{organisation_email}

" msgstr "DMPonline" +#, fuzzy +msgid "A Data Management Plan in %{application_name} has been shared with you" +msgstr "DMPonline" + msgid "A colleague has invited you to contribute to their Data Management Plan at " msgstr "" @@ -255,8 +259,9 @@ msgid "Actions" msgstr "Actions" -msgid "Add an appropriate name for your guidance group e.g. Glasgow guidance. This name will be used to tell the end user where the guidance has come from e.g. 'Glasgow Guidance on Metadata'" -msgstr "Ajoutez un nom adéquat à votre groupe de conseils, par ex. : Conseils de Glasgow. Ce nom sera utilié pour indiquer à lutilisateur final lorigine des conseils, par ex. : Glasgow Guidance on Metadata" +#, fuzzy +msgid "Add an appropriate name for your guidance group. This name will be used to tell the end user where the guidance has come from. It will be appended to text identifying the theme e.g. \"[guidance group name]: guidance on data sharing\" so we suggest you just use the institution or department name." +msgstr "Groupe de conseils" msgid "Add collaborator" msgstr "Ajouter le collaborateur"