diff --git a/app/controllers/admin/annotations_controller.rb b/app/controllers/admin/annotations_controller.rb index dc0830e..f0881d1 100644 --- a/app/controllers/admin/annotations_controller.rb +++ b/app/controllers/admin/annotations_controller.rb @@ -5,14 +5,14 @@ # # def index # super - # @resources = SuggestedAnswer. + # @resources = Annotation. # page(params[:page]). # per(10) # end # Define a custom finder by overriding the `find_resource` method: # def find_resource(param) - # SuggestedAnswer.find_by!(slug: param) + # Annotation.find_by!(slug: param) # end # See https://administrate-prototype.herokuapp.com/customizing_controller_actions diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index dbc8dd4..bcaf9b9 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -40,10 +40,10 @@ redirect_to after_sign_up_error_path_for(resource), alert: _('You must accept the terms and conditions to register.') else existing_user = User.find_by_email(sign_up_params[:email]) - if !existing_user.nil? then - if (existing_user.password == "" || existing_user.password.nil?) && existing_user.confirmed_at.nil? then - @user = existing_user - do_update(false, true) + if !existing_user.nil? # If email exists + if (existing_user.password == "" || existing_user.password.nil?) && existing_user.confirmed_at.nil? # If user has not accepted invitation yet + existing_user.destroy # Only solution for now + super else redirect_to after_sign_up_error_path_for(resource), alert: _('That email address is already registered.') end @@ -91,16 +91,16 @@ end def do_update(require_password = true, confirm = false) - if require_password # user is changing email or password - if current_user.email != params[:user][:email] # if user changing email - if params[:user][:current_password].blank? # password needs to be present + if require_password # user is changing email or password + if current_user.email != params[:user][:email] # if user is changing email + if params[:user][:current_password].blank? # password needs to be present message = _('Please enter your password to change email address.') successfully_updated = false else successfully_updated = current_user.update_with_password(password_update) end - elsif params[:user][:password].present? # user is changing password - successfully_updated = false # shared across first 3 conditions + elsif params[:user][:password].present? # if user is changing password + successfully_updated = false # shared across first 3 conditions if params[:user][:current_password].blank? message = _('Please enter your current password') elsif params[:user][:password_confirmation].blank? @@ -110,10 +110,10 @@ else successfully_updated = current_user.update_with_password(password_update) end - else # potentially unreachable... but I dont like to leave off the else + else # potentially unreachable... but I dont like to leave off the else successfully_updated = current_user.update_with_password(password_update) end - else # password not required + else # password not required successfully_updated = current_user.update_without_password(update_params) end @@ -125,7 +125,7 @@ #render the correct page if successfully_updated if confirm - current_user.skip_confirmation! + current_user.skip_confirmation! # will error out if confirmable is turned off in user model current_user.save! end session[:locale] = current_user.get_locale unless current_user.get_locale.nil? diff --git a/app/dashboards/annotation_dashboard.rb b/app/dashboards/annotation_dashboard.rb index add7afa..e26b609 100644 --- a/app/dashboards/annotation_dashboard.rb +++ b/app/dashboards/annotation_dashboard.rb @@ -12,7 +12,7 @@ question: Field::BelongsTo, id: Field::Number, text: Field::Text, - type: Field::integer, + type: Field::String.with_options(searchable: false), created_at: Field::DateTime, updated_at: Field::DateTime, }.freeze @@ -51,10 +51,10 @@ :type, ].freeze - # Overwrite this method to customize how suggested answers are displayed + # Overwrite this method to customize how annotations are displayed # across all pages of the admin dashboard. # - # def display_resource(suggested_answer) - # "SuggestedAnswer ##{suggested_answer.id}" + # def display_resource(annotation) + # "Annotation ##{annotation.id}" # end end diff --git a/app/views/administrate/application/_search.html.erb b/app/views/administrate/application/_search.html.erb new file mode 100644 index 0000000..7145011 --- /dev/null +++ b/app/views/administrate/application/_search.html.erb @@ -0,0 +1,21 @@ +
+ + <%= image_tag "administrate/search.svg", alt: "search", width: 16, height: 16 %> + + + + Press enter to search + + + <%= link_to clear_search_params do %> + <%= image_tag "administrate/cancel.svg", alt: "cancel-search", width: 16, height: 16 %> + <% end %> + +
diff --git a/config/locale/app.pot b/config/locale/app.pot index 6dd6de5..8383875 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-05-15 20:57+0000\n" -"PO-Revision-Date: 2017-05-15 20:57+0000\n" +"POT-Creation-Date: 2017-05-19 17:36+0100\n" +"PO-Revision-Date: 2017-05-19 17:36+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -24,7 +24,10 @@ msgid " - " msgstr "" -msgid " I accept the terms and conditions *" +msgid " Guidance" +msgstr "" + +msgid " I accept the terms and conditions *" msgstr "" msgid " Plan" @@ -252,6 +255,9 @@ msgid "Add collaborator" msgstr "" +msgid "Add example answer" +msgstr "" + msgid "Add guidance" msgstr "" @@ -273,9 +279,6 @@ msgid "Add section" msgstr "" -msgid "Add suggested answer/ example" -msgstr "" - msgid "Additional comment area will be displayed." msgstr "" @@ -303,6 +306,9 @@ msgid "Answered" msgstr "" +msgid "Answered " +msgstr "" + msgid "Answered at" msgstr "" @@ -342,6 +348,9 @@ msgid "Before you get started, we need to ask a few questions to set you up with the best DMP template for your needs." msgstr "" +msgid "Begin typing to see a filtered list" +msgstr "" + msgid "Below is a list of users registered for your organisation. You can sort the data by each field." msgstr "" @@ -465,6 +474,9 @@ msgid "Display additional comment area." msgstr "" +msgid "Draft" +msgstr "" + msgid "Dropdown" msgstr "" @@ -474,6 +486,9 @@ msgid "Edit" msgstr "" +msgid "Edit Example of Answer" +msgstr "" + msgid "Edit User Privileges" msgstr "" @@ -495,9 +510,6 @@ msgid "Edit question" msgstr "" -msgid "Edit suggested answer/ example" -msgstr "" - msgid "Edit template details" msgstr "" @@ -537,6 +549,12 @@ msgid "Error!" msgstr "" +msgid "Example Answer" +msgstr "" + +msgid "Example of Answer" +msgstr "" + msgid "Example of answer" msgstr "" @@ -942,6 +960,9 @@ msgid "Please enter your current password below when changing your email address." msgstr "" +msgid "Please enter your email" +msgstr "" + msgid "Please enter your first name." msgstr "" @@ -969,9 +990,6 @@ msgid "Please select one" msgstr "" -msgid "Policy Expectations" -msgstr "" - msgid "Preview" msgstr "" @@ -1233,9 +1251,6 @@ msgid "This document was generated by %{application_name}" msgstr "" -msgid "This must be a valid email address - a message will be sent to it for confirmation." -msgstr "" - msgid "This must match what you entered in the previous field." msgstr "" @@ -1392,12 +1407,18 @@ msgid "You are about to delete a suggested answer/ example for '%{question_text}'. Are you sure?" msgstr "" +msgid "You are about to delete an example answer for '%{question_text}'. Are you sure?" +msgstr "" + msgid "You are not authorized to perform this action." msgstr "" msgid "You are viewing a historical version of this template. You will not be able to make changes." msgstr "" +msgid "You can add an example answer to help users respond. These will be presented above the answer box and can be copied/ pasted." +msgstr "" + msgid "You can add an example or suggested answer to help users respond. These will be presented above the answer box and can be copied/ pasted." msgstr "" @@ -1527,6 +1548,9 @@ msgid "by" msgstr "" +msgid "by " +msgstr "" + msgid "can't be blank" msgstr "" @@ -1539,6 +1563,9 @@ msgid "e.g. School/ Department" msgstr "" +msgid "example answer" +msgstr "" + msgid "from now" msgstr "" @@ -1596,9 +1623,6 @@ msgid "or copy" msgstr "" -msgid "org_admin.templates.edit_phase_label" -msgstr "" - msgid "organisation" msgstr "" @@ -1632,9 +1656,6 @@ msgid "select at least one theme" msgstr "" -msgid "suggested answer" -msgstr "" - msgid "template" msgstr "" diff --git a/config/locale/de/app.po b/config/locale/de/app.po index bdbe788..b52820b 100644 --- a/config/locale/de/app.po +++ b/config/locale/de/app.po @@ -23,7 +23,11 @@ msgstr " - " #, fuzzy -msgid " I accept the terms and conditions *" +msgid " Guidance" +msgstr "Hilfestellung" + +#, fuzzy +msgid " I accept the terms and conditions *" msgstr "Ich akzeptiere die Nutzungsbedingungen *" #, fuzzy @@ -269,6 +273,9 @@ msgid "Add collaborator" msgstr "Mitarbeitende(n) hinzufügen" +msgid "Add example answer" +msgstr "" + msgid "Add guidance" msgstr "Hilfestellung hinzufügen" @@ -290,9 +297,6 @@ msgid "Add section" msgstr "Abschnitt hinzufügen" -msgid "Add suggested answer/ example" -msgstr "Antwortvorschlag / Beispiel hinzufügen" - msgid "Additional comment area will be displayed." msgstr "" @@ -323,6 +327,10 @@ msgstr "Beantwortet " #, fuzzy +msgid "Answered " +msgstr "Beantwortet " + +#, fuzzy msgid "Answered at" msgstr "Beantwortet " @@ -364,6 +372,9 @@ msgid "Before you get started, we need to ask a few questions to set you up with the best DMP template for your needs." msgstr "Fragen" +msgid "Begin typing to see a filtered list" +msgstr "" + msgid "Below is a list of users registered for your organisation. You can sort the data by each field." msgstr "Folgend findet sich die Liste von Benutzern registriert bzgl. Ihrer Org. Sie können diese Liste bzgl. aller Felder sortieren." @@ -492,6 +503,9 @@ msgid "Display additional comment area." msgstr "" +msgid "Draft" +msgstr "" + msgid "Dropdown" msgstr "Klappliste" @@ -501,6 +515,10 @@ msgid "Edit" msgstr "Bearbeiten" +#, fuzzy +msgid "Edit Example of Answer" +msgstr "Beispielantwort" + msgid "Edit User Privileges" msgstr "Bearbeiten Benutzerberechtigungen" @@ -522,9 +540,6 @@ msgid "Edit question" msgstr "Frage bearbeiten" -msgid "Edit suggested answer/ example" -msgstr "Antwortvorschlag / Beispiel bearbeiten" - msgid "Edit template details" msgstr "Details der Vorlage bearbeiten" @@ -565,6 +580,14 @@ msgid "Error!" msgstr "Fehler!" +#, fuzzy +msgid "Example Answer" +msgstr "Beispielantwort" + +#, fuzzy +msgid "Example of Answer" +msgstr "Beispielantwort" + msgid "Example of answer" msgstr "Beispielantwort" @@ -983,6 +1006,9 @@ msgid "Please enter your current password below when changing your email address." msgstr "" +msgid "Please enter your email" +msgstr "" + msgid "Please enter your first name." msgstr "Bitte geben Sie ihren Vornamen ein." @@ -1011,9 +1037,6 @@ msgid "Please select one" msgstr "" -msgid "Policy Expectations" -msgstr "Policy Expectations" - msgid "Preview" msgstr "Vorschau" @@ -1282,9 +1305,6 @@ msgid "This document was generated by %{application_name}" msgstr "%{application_name}" -msgid "This must be a valid email address - a message will be sent to it for confirmation." -msgstr "" - msgid "This must match what you entered in the previous field." msgstr "Die Eingabe in diesem Feld muss mit der im vorherigen Feld übereinstimmen." @@ -1450,6 +1470,10 @@ msgid "You are about to delete a suggested answer/ example for '%{question_text}'. Are you sure?" msgstr "Sie sind dabei den Antwortvorschlag / das Beispiel für '%{question_text}' zu löschen. Sind Sie sicher?" +#, fuzzy +msgid "You are about to delete an example answer for '%{question_text}'. Are you sure?" +msgstr "Sie sind dabei den Antwortvorschlag / das Beispiel für '%{question_text}' zu löschen. Sind Sie sicher?" + msgid "You are not authorized to perform this action." msgstr "" @@ -1457,6 +1481,10 @@ msgid "You are viewing a historical version of this template. You will not be able to make changes." msgstr "templates" +#, fuzzy +msgid "You can add an example answer to help users respond. These will be presented above the answer box and can be copied/ pasted." +msgstr "Hier können Sie einen Text als Beispiel oder Vorschlag angeben, der Nutzern bei der Beantwortung helfen soll. Der Text erscheint oberhalb des Antwortfeldes und kann kopiert und eingefügt werden." + msgid "You can add an example or suggested answer to help users respond. These will be presented above the answer box and can be copied/ pasted." msgstr "Hier können Sie einen Text als Beispiel oder Vorschlag angeben, der Nutzern bei der Beantwortung helfen soll. Der Text erscheint oberhalb des Antwortfeldes und kann kopiert und eingefügt werden." @@ -1609,6 +1637,10 @@ msgid "by" msgstr "" +#, fuzzy +msgid "by " +msgstr " von " + msgid "can't be blank" msgstr "" @@ -1621,6 +1653,10 @@ msgid "e.g. School/ Department" msgstr "z.B. Fakultät / Einrichtung" +#, fuzzy +msgid "example answer" +msgstr "Beispielantwort" + msgid "from now" msgstr "" @@ -1687,10 +1723,6 @@ msgstr "(or copy" #, fuzzy -msgid "org_admin.templates.edit_phase_label" -msgstr "org_admin" - -#, fuzzy msgid "organisation" msgstr "Organisation" @@ -1731,10 +1763,6 @@ msgstr "select at least one theme" #, fuzzy -msgid "suggested answer" -msgstr "Antwortvorschlag" - -#, fuzzy msgid "template" msgstr "templates" diff --git a/config/locale/en_GB/app.po b/config/locale/en_GB/app.po index 3a2db97..8c0cca3 100644 --- a/config/locale/en_GB/app.po +++ b/config/locale/en_GB/app.po @@ -22,7 +22,12 @@ msgid " - " msgstr " - " -msgid " I accept the terms and conditions *" +#, fuzzy +msgid " Guidance" +msgstr "Guidance" + +#, fuzzy +msgid " I accept the terms and conditions *" msgstr " I accept the terms and conditions *" #, fuzzy @@ -259,6 +264,9 @@ msgid "Add collaborator" msgstr "Add collaborator" +msgid "Add example answer" +msgstr "" + msgid "Add guidance" msgstr "Add guidance" @@ -280,9 +288,6 @@ msgid "Add section" msgstr "Add section" -msgid "Add suggested answer/ example" -msgstr "Add suggested answer/ example" - msgid "Additional comment area will be displayed." msgstr "Additional comment area will be displayed." @@ -310,6 +315,10 @@ msgid "Answered" msgstr "Answered" +#, fuzzy +msgid "Answered " +msgstr "Answered" + msgid "Answered at" msgstr "Answered at" @@ -350,6 +359,9 @@ msgid "Before you get started, we need to ask a few questions to set you up with the best DMP template for your needs." msgstr "questions" +msgid "Begin typing to see a filtered list" +msgstr "" + msgid "Below is a list of users registered for your organisation. You can sort the data by each field." msgstr "Below is a list of users registered for your organisation. You can sort the data by each field." @@ -474,6 +486,9 @@ msgid "Display additional comment area." msgstr "Display additional comment area." +msgid "Draft" +msgstr "" + msgid "Dropdown" msgstr "Dropdown" @@ -483,6 +498,10 @@ msgid "Edit" msgstr "Edit" +#, fuzzy +msgid "Edit Example of Answer" +msgstr "Example of answer" + msgid "Edit User Privileges" msgstr "Edit User Privileges" @@ -504,9 +523,6 @@ msgid "Edit question" msgstr "Edit question" -msgid "Edit suggested answer/ example" -msgstr "Edit suggested answer/ example" - msgid "Edit template details" msgstr "Edit template details" @@ -546,6 +562,14 @@ msgid "Error!" msgstr "Error!" +#, fuzzy +msgid "Example Answer" +msgstr "Example of answer" + +#, fuzzy +msgid "Example of Answer" +msgstr "Example of answer" + msgid "Example of answer" msgstr "Example of answer" @@ -959,6 +983,9 @@ msgid "Please enter your current password below when changing your email address." msgstr "" +msgid "Please enter your email" +msgstr "" + msgid "Please enter your first name." msgstr "Please enter your first name." @@ -987,9 +1014,6 @@ msgid "Please select one" msgstr "" -msgid "Policy Expectations" -msgstr "Policy Expectations" - msgid "Preview" msgstr "Preview" @@ -1256,9 +1280,6 @@ msgid "This document was generated by %{application_name}" msgstr "This document was generated by %{application_name}" -msgid "This must be a valid email address - a message will be sent to it for confirmation." -msgstr "This must be a valid email address - a message will be sent to it for confirmation." - msgid "This must match what you entered in the previous field." msgstr "This must match what you entered in the previous field." @@ -1421,12 +1442,20 @@ msgid "You are about to delete a suggested answer/ example for '%{question_text}'. Are you sure?" msgstr "You are about to delete a suggested answer/ example for '%{question_text}'. Are you sure?" +#, fuzzy +msgid "You are about to delete an example answer for '%{question_text}'. Are you sure?" +msgstr "You are about to delete a suggested answer/ example for '%{question_text}'. Are you sure?" + msgid "You are not authorized to perform this action." msgstr "" msgid "You are viewing a historical version of this template. You will not be able to make changes." msgstr "You are viewing a historical version of this template. You will not be able to make changes." +#, fuzzy +msgid "You can add an example answer to help users respond. These will be presented above the answer box and can be copied/ pasted." +msgstr "You can add an example or suggested answer to help users respond. These will be presented above the answer box and can be copied/ pasted." + msgid "You can add an example or suggested answer to help users respond. These will be presented above the answer box and can be copied/ pasted." msgstr "You can add an example or suggested answer to help users respond. These will be presented above the answer box and can be copied/ pasted." @@ -1560,6 +1589,10 @@ msgid "by" msgstr "" +#, fuzzy +msgid "by " +msgstr " by " + msgid "can't be blank" msgstr "" @@ -1572,6 +1605,10 @@ msgid "e.g. School/ Department" msgstr "e.g. School/ Department" +#, fuzzy +msgid "example answer" +msgstr "Example of answer" + msgid "from now" msgstr "from now" @@ -1631,9 +1668,6 @@ msgid "or copy" msgstr "or copy" -msgid "org_admin.templates.edit_phase_label" -msgstr "" - msgid "organisation" msgstr "organisation" @@ -1667,9 +1701,6 @@ msgid "select at least one theme" msgstr "select at least one theme" -msgid "suggested answer" -msgstr "suggested answer" - msgid "template" msgstr "template" diff --git a/config/locale/en_US/app.po b/config/locale/en_US/app.po index dd2eafe..b70e2b3 100644 --- a/config/locale/en_US/app.po +++ b/config/locale/en_US/app.po @@ -22,7 +22,12 @@ msgid " - " msgstr " - " -msgid " I accept the terms and conditions *" +#, fuzzy +msgid " Guidance" +msgstr "Guidance" + +#, fuzzy +msgid " I accept the terms and conditions *" msgstr " I accept the terms and conditions *" #, fuzzy @@ -259,6 +264,9 @@ msgid "Add collaborator" msgstr "Add collaborator" +msgid "Add example answer" +msgstr "" + msgid "Add guidance" msgstr "Add guidance" @@ -280,9 +288,6 @@ msgid "Add section" msgstr "Add section" -msgid "Add suggested answer/ example" -msgstr "Add suggested answer/ example" - msgid "Additional comment area will be displayed." msgstr "Additional comment area will be displayed." @@ -310,6 +315,10 @@ msgid "Answered" msgstr "Answered" +#, fuzzy +msgid "Answered " +msgstr "Answered" + msgid "Answered at" msgstr "Answered at" @@ -350,6 +359,9 @@ msgid "Before you get started, we need to ask a few questions to set you up with the best DMP template for your needs." msgstr "questions" +msgid "Begin typing to see a filtered list" +msgstr "" + msgid "Below is a list of users registered for your organisation. You can sort the data by each field." msgstr "Below is a list of users registered for your organization. You can sort the data by each field." @@ -474,6 +486,9 @@ msgid "Display additional comment area." msgstr "Display additional comment area." +msgid "Draft" +msgstr "" + msgid "Dropdown" msgstr "Dropdown" @@ -483,6 +498,10 @@ msgid "Edit" msgstr "Edit" +#, fuzzy +msgid "Edit Example of Answer" +msgstr "Example of answer" + msgid "Edit User Privileges" msgstr "Edit User Permissions" @@ -504,9 +523,6 @@ msgid "Edit question" msgstr "Edit question" -msgid "Edit suggested answer/ example" -msgstr "Edit suggested answer/ example" - msgid "Edit template details" msgstr "Edit template details" @@ -546,6 +562,14 @@ msgid "Error!" msgstr "Error!" +#, fuzzy +msgid "Example Answer" +msgstr "Example of answer" + +#, fuzzy +msgid "Example of Answer" +msgstr "Example of answer" + msgid "Example of answer" msgstr "Example of answer" @@ -959,6 +983,9 @@ msgid "Please enter your current password below when changing your email address." msgstr "" +msgid "Please enter your email" +msgstr "" + msgid "Please enter your first name." msgstr "Please enter your first name." @@ -987,9 +1014,6 @@ msgid "Please select one" msgstr "" -msgid "Policy Expectations" -msgstr "Policy Expectations" - msgid "Preview" msgstr "Preview" @@ -1256,9 +1280,6 @@ msgid "This document was generated by %{application_name}" msgstr "This document was generated by %{application_name}" -msgid "This must be a valid email address - a message will be sent to it for confirmation." -msgstr "This must be a valid email address - a message will be sent to it for confirmation." - msgid "This must match what you entered in the previous field." msgstr "This must match what you entered in the previous field." @@ -1421,12 +1442,20 @@ msgid "You are about to delete a suggested answer/ example for '%{question_text}'. Are you sure?" msgstr "You are about to delete a suggested answer/ example for '%{question_text}'. Are you sure?" +#, fuzzy +msgid "You are about to delete an example answer for '%{question_text}'. Are you sure?" +msgstr "You are about to delete a suggested answer/ example for '%{question_text}'. Are you sure?" + msgid "You are not authorized to perform this action." msgstr "" msgid "You are viewing a historical version of this template. You will not be able to make changes." msgstr "You are viewing a historical version of this template. You will not be able to make changes." +#, fuzzy +msgid "You can add an example answer to help users respond. These will be presented above the answer box and can be copied/ pasted." +msgstr "You can add an example or suggested answer to help users respond. These will be presented above the answer box and can be copied/ pasted." + msgid "You can add an example or suggested answer to help users respond. These will be presented above the answer box and can be copied/ pasted." msgstr "You can add an example or suggested answer to help users respond. These will be presented above the answer box and can be copied/ pasted." @@ -1560,6 +1589,10 @@ msgid "by" msgstr "" +#, fuzzy +msgid "by " +msgstr " by " + msgid "can't be blank" msgstr "" @@ -1572,6 +1605,10 @@ msgid "e.g. School/ Department" msgstr "e.g. School/ Department" +#, fuzzy +msgid "example answer" +msgstr "Example of answer" + msgid "from now" msgstr "from now" @@ -1631,9 +1668,6 @@ msgid "or copy" msgstr "or copy" -msgid "org_admin.templates.edit_phase_label" -msgstr "" - msgid "organisation" msgstr "organization" @@ -1667,9 +1701,6 @@ msgid "select at least one theme" msgstr "select at least one theme" -msgid "suggested answer" -msgstr "suggested answer" - msgid "template" msgstr "template" diff --git a/config/locale/es/app.po b/config/locale/es/app.po index 4909cb5..5711578 100644 --- a/config/locale/es/app.po +++ b/config/locale/es/app.po @@ -23,7 +23,11 @@ msgstr "" #, fuzzy -msgid " I accept the terms and conditions *" +msgid " Guidance" +msgstr "Guía" + +#, fuzzy +msgid " I accept the terms and conditions *" msgstr " Acepto los términos y condiciones *" #, fuzzy @@ -265,6 +269,9 @@ msgid "Add collaborator" msgstr "Añadir colaborador" +msgid "Add example answer" +msgstr "" + msgid "Add guidance" msgstr "Añadir orientación" @@ -286,9 +293,6 @@ msgid "Add section" msgstr "Añadir sección" -msgid "Add suggested answer/ example" -msgstr "Añadir respuesta sugerida / ejemplo" - msgid "Additional comment area will be displayed." msgstr "Se mostrará un área adicional para comentarios." @@ -319,6 +323,10 @@ msgstr "Contestado " #, fuzzy +msgid "Answered " +msgstr "Contestado " + +#, fuzzy msgid "Answered at" msgstr "Contestado " @@ -361,6 +369,9 @@ msgid "Before you get started, we need to ask a few questions to set you up with the best DMP template for your needs." msgstr "Preguntas" +msgid "Begin typing to see a filtered list" +msgstr "" + msgid "Below is a list of users registered for your organisation. You can sort the data by each field." msgstr "Debajo tiene la lista de usuarios registrados en su entidad. Puede ordenar los datos por campo." @@ -488,6 +499,9 @@ msgid "Display additional comment area." msgstr "Mostrar un área de comentarios adicional." +msgid "Draft" +msgstr "" + msgid "Dropdown" msgstr "Dropdown" @@ -497,6 +511,10 @@ msgid "Edit" msgstr "Editar" +#, fuzzy +msgid "Edit Example of Answer" +msgstr "Respuesta de ejemplo" + msgid "Edit User Privileges" msgstr "" @@ -518,9 +536,6 @@ msgid "Edit question" msgstr "Editar la pregunta" -msgid "Edit suggested answer/ example" -msgstr "Editar respuesta sugerida / ejemplo" - msgid "Edit template details" msgstr "Editar plantilla" @@ -561,6 +576,14 @@ msgid "Error!" msgstr "¡Error!" +#, fuzzy +msgid "Example Answer" +msgstr "Respuesta de ejemplo" + +#, fuzzy +msgid "Example of Answer" +msgstr "Respuesta de ejemplo" + msgid "Example of answer" msgstr "Respuesta de ejemplo" @@ -978,6 +1001,9 @@ msgid "Please enter your current password below when changing your email address." msgstr "" +msgid "Please enter your email" +msgstr "" + msgid "Please enter your first name." msgstr "Por favor, introduzca su nombre." @@ -1006,9 +1032,6 @@ msgid "Please select one" msgstr "" -msgid "Policy Expectations" -msgstr "Política esperada" - msgid "Preview" msgstr "Previsualización" @@ -1275,9 +1298,6 @@ msgid "This document was generated by %{application_name}" msgstr "DMPonline" -msgid "This must be a valid email address - a message will be sent to it for confirmation." -msgstr "" - msgid "This must match what you entered in the previous field." msgstr "Ha de coincidir con lo que introdujo en el campo anterior." @@ -1443,6 +1463,10 @@ msgid "You are about to delete a suggested answer/ example for '%{question_text}'. Are you sure?" msgstr "Va a eliminar una respuesta sugerida / ejemplo de '%{question_text}'. ¿Está seguro?" +#, fuzzy +msgid "You are about to delete an example answer for '%{question_text}'. Are you sure?" +msgstr "Va a eliminar una respuesta sugerida / ejemplo de '%{question_text}'. ¿Está seguro?" + msgid "You are not authorized to perform this action." msgstr "" @@ -1450,6 +1474,10 @@ msgid "You are viewing a historical version of this template. You will not be able to make changes." msgstr "templates" +#, fuzzy +msgid "You can add an example answer to help users respond. These will be presented above the answer box and can be copied/ pasted." +msgstr "Puede añadir un ejemplo o respuesta sugerida para ayudar a responder a sus usuarios. Se presentará bajo la caja de respuestas y pueden ser copiada y pegada." + msgid "You can add an example or suggested answer to help users respond. These will be presented above the answer box and can be copied/ pasted." msgstr "Puede añadir un ejemplo o respuesta sugerida para ayudar a responder a sus usuarios. Se presentará bajo la caja de respuestas y pueden ser copiada y pegada." @@ -1594,6 +1622,10 @@ msgid "by" msgstr "" +#, fuzzy +msgid "by " +msgstr " por " + msgid "can't be blank" msgstr "" @@ -1606,6 +1638,10 @@ msgid "e.g. School/ Department" msgstr "ej: Escuela / Departmento" +#, fuzzy +msgid "example answer" +msgstr "Respuesta de ejemplo" + msgid "from now" msgstr "" @@ -1670,10 +1706,6 @@ msgstr "" #, fuzzy -msgid "org_admin.templates.edit_phase_label" -msgstr "org_admin" - -#, fuzzy msgid "organisation" msgstr "Organización" @@ -1714,10 +1746,6 @@ msgstr "" #, fuzzy -msgid "suggested answer" -msgstr "Respuesta sugerida" - -#, fuzzy msgid "template" msgstr "templates" diff --git a/config/locale/fr/app.po b/config/locale/fr/app.po index e582167..21b7c0d 100644 --- a/config/locale/fr/app.po +++ b/config/locale/fr/app.po @@ -23,7 +23,11 @@ msgstr "" #, fuzzy -msgid " I accept the terms and conditions *" +msgid " Guidance" +msgstr "Conseils" + +#, fuzzy +msgid " I accept the terms and conditions *" msgstr " Jaccepte les Conditions générales dutilisation. *" #, fuzzy @@ -264,6 +268,9 @@ msgid "Add collaborator" msgstr "Ajouter le collaborateur" +msgid "Add example answer" +msgstr "" + msgid "Add guidance" msgstr "Ajoutez des conseils" @@ -285,9 +292,6 @@ msgid "Add section" msgstr "Ajouter une section" -msgid "Add suggested answer/ example" -msgstr "Ajouter une suggestion/un exemple de réponse" - msgid "Additional comment area will be displayed." msgstr "" @@ -318,6 +322,10 @@ msgstr "Réponse " #, fuzzy +msgid "Answered " +msgstr "Réponse " + +#, fuzzy msgid "Answered at" msgstr "Réponse " @@ -360,6 +368,9 @@ msgid "Before you get started, we need to ask a few questions to set you up with the best DMP template for your needs." msgstr "Questions" +msgid "Begin typing to see a filtered list" +msgstr "" + msgid "Below is a list of users registered for your organisation. You can sort the data by each field." msgstr "La liste ci-dessous indique les utilisateurs de votre organisme. Ces informations peuvent être triées par champ." @@ -486,6 +497,9 @@ msgid "Display additional comment area." msgstr "" +msgid "Draft" +msgstr "" + msgid "Dropdown" msgstr "Liste déroulante" @@ -495,6 +509,10 @@ msgid "Edit" msgstr "Modifier" +#, fuzzy +msgid "Edit Example of Answer" +msgstr "Exemple de réponse" + msgid "Edit User Privileges" msgstr "" @@ -516,9 +534,6 @@ msgid "Edit question" msgstr "Modifier la question" -msgid "Edit suggested answer/ example" -msgstr "Modifier la suggestion/lexemple de réponse" - msgid "Edit template details" msgstr "Modifier les détails du modèle" @@ -559,6 +574,14 @@ msgid "Error!" msgstr "Erreur!" +#, fuzzy +msgid "Example Answer" +msgstr "Exemple de réponse" + +#, fuzzy +msgid "Example of Answer" +msgstr "Exemple de réponse" + msgid "Example of answer" msgstr "Exemple de réponse" @@ -975,6 +998,9 @@ msgid "Please enter your current password below when changing your email address." msgstr "" +msgid "Please enter your email" +msgstr "" + msgid "Please enter your first name." msgstr "Entrez votre prénom, svp." @@ -1003,9 +1029,6 @@ msgid "Please select one" msgstr "" -msgid "Policy Expectations" -msgstr "Résultats attendus du plan" - msgid "Preview" msgstr "Aperçu" @@ -1272,9 +1295,6 @@ msgid "This document was generated by %{application_name}" msgstr "%{application_name}" -msgid "This must be a valid email address - a message will be sent to it for confirmation." -msgstr "" - msgid "This must match what you entered in the previous field." msgstr "" @@ -1440,6 +1460,10 @@ msgid "You are about to delete a suggested answer/ example for '%{question_text}'. Are you sure?" msgstr "Vous allez supprimer la suggestion/lexemple de réponse à la questioo : %{question_text}. En êtes-vous sûr ?" +#, fuzzy +msgid "You are about to delete an example answer for '%{question_text}'. Are you sure?" +msgstr "Vous allez supprimer la suggestion/lexemple de réponse à la questioo : %{question_text}. En êtes-vous sûr ?" + msgid "You are not authorized to perform this action." msgstr "" @@ -1447,6 +1471,10 @@ msgid "You are viewing a historical version of this template. You will not be able to make changes." msgstr "templates" +#, fuzzy +msgid "You can add an example answer to help users respond. These will be presented above the answer box and can be copied/ pasted." +msgstr "Vous pouvez ajouter un exemple ou une suggestion de réponse pour aider les utilisateurs. Ils safficheront au-dessus de la grille de réponse et on peut les copier/coller." + msgid "You can add an example or suggested answer to help users respond. These will be presented above the answer box and can be copied/ pasted." msgstr "Vous pouvez ajouter un exemple ou une suggestion de réponse pour aider les utilisateurs. Ils safficheront au-dessus de la grille de réponse et on peut les copier/coller." @@ -1591,6 +1619,10 @@ msgid "by" msgstr "" +#, fuzzy +msgid "by " +msgstr " par " + msgid "can't be blank" msgstr "" @@ -1603,6 +1635,10 @@ msgid "e.g. School/ Department" msgstr "par ex. : Faculté/Département" +#, fuzzy +msgid "example answer" +msgstr "Exemple de réponse" + msgid "from now" msgstr "" @@ -1667,10 +1703,6 @@ msgstr "" #, fuzzy -msgid "org_admin.templates.edit_phase_label" -msgstr "org_admin" - -#, fuzzy msgid "organisation" msgstr "Organisation" @@ -1711,10 +1743,6 @@ msgstr "" #, fuzzy -msgid "suggested answer" -msgstr "Suggestion de réponse" - -#, fuzzy msgid "template" msgstr "templates"