From 10a87eb4cb4b75e6daa043f076f52a039710fdfe Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 9 May 2019 16:09:20 +0200 Subject: [PATCH] refactored project list translations --- .../javascripts/controllers/projects.js.erb | 2 +- app/assets/templates/projects/index.html.erb | 30 +++++++++---------- config/locales/app.public.en.yml | 28 +++++++++-------- config/locales/app.public.es.yml | 28 +++++++++-------- config/locales/app.public.fr.yml | 28 +++++++++-------- config/locales/app.public.pt.yml | 28 +++++++++-------- 6 files changed, 76 insertions(+), 68 deletions(-) diff --git a/app/assets/javascripts/controllers/projects.js.erb b/app/assets/javascripts/controllers/projects.js.erb index 2bea115e2..3de0fa16d 100644 --- a/app/assets/javascripts/controllers/projects.js.erb +++ b/app/assets/javascripts/controllers/projects.js.erb @@ -323,7 +323,7 @@ Application.Controllers.controller('ProjectsController', ['$scope', '$state', 'P $scope.projectsPagination = new paginationService.Instance(OpenlabProject, currentPage, PROJECTS_PER_PAGE, null, { }, loadMoreOpenlabCallback); return OpenlabProject.query({ q: $scope.search.q, page: currentPage, per_page: PROJECTS_PER_PAGE }, function (projectsPromise) { if (projectsPromise.errors != null) { - growl.error(_t('openlab_search_not_available_at_the_moment')); + growl.error(_t('projects_list.openlab_search_not_available_at_the_moment')); $scope.openlab.searchOverWholeNetwork = false; return $scope.triggerSearch(); } else { diff --git a/app/assets/templates/projects/index.html.erb b/app/assets/templates/projects/index.html.erb index 5baef2d01..f927f20b2 100644 --- a/app/assets/templates/projects/index.html.erb +++ b/app/assets/templates/projects/index.html.erb @@ -7,13 +7,13 @@
-

{{ 'the_fablab_projects' }}

+

{{ 'projects_list.the_fablab_projects' }}

- {{ 'add_a_project' }} + {{ 'projects_list.add_a_project' }}
@@ -23,10 +23,10 @@
- {{ 'reset_all_filters' | translate }} + {{ 'projects_list.reset_all_filters' | translate }} - - + +
- +
@@ -53,27 +53,27 @@
@@ -81,7 +81,7 @@
- {{ 'project_search_result_is_empty' | translate }} + {{ 'projects_list.project_search_result_is_empty' | translate }}
@@ -99,7 +99,7 @@
- {{ 'rough_draft' }} + {{ 'projects_list.rough_draft' }}
diff --git a/config/locales/app.public.en.yml b/config/locales/app.public.en.yml index 257814983..1e45c6408 100644 --- a/config/locales/app.public.en.yml +++ b/config/locales/app.public.en.yml @@ -148,19 +148,21 @@ en: projects_list: # projects gallery - the_fablab_projects: "The Fab Lab projects" - search_over_the_whole_network: "Search over the whole Fab Manager network" - tooltip_openlab_projects_switch: "The search over the whole network lets you search over the projects of every Fab-manager using this feature !" - openlab_search_not_available_at_the_moment: "Search over the whole network is not available at the moment. You still can search over the projects of this platform." - project_search_result_is_empty: "Sorry, we found no results matching your search criteria." - reset_all_filters: "Reset all filters" - search: "Search" - all_projects: "All projects" - my_projects: "My projects" - projects_to_whom_i_take_part_in: "Projects to whom I take part in" - all_machines: "All machines" - all_materials: "All materials" - load_next_projects: "Load next projects" + projects_list: + the_fablab_projects: "The Fab Lab projects" + search_over_the_whole_network: "Search over the whole Fab Manager network" + tooltip_openlab_projects_switch: "The search over the whole network lets you search over the projects of every Fab-manager using this feature !" + openlab_search_not_available_at_the_moment: "Search over the whole network is not available at the moment. You still can search over the projects of this platform." + project_search_result_is_empty: "Sorry, we found no results matching your search criteria." + reset_all_filters: "Reset all filters" + search: "Search" + all_projects: "All projects" + my_projects: "My projects" + projects_to_whom_i_take_part_in: "Projects to whom I take part in" + all_machines: "All machines" + all_materials: "All materials" + load_next_projects: "Load next projects" + rough_draft: "Rough draft" projects_show: # details of a projet diff --git a/config/locales/app.public.es.yml b/config/locales/app.public.es.yml index b59f42f38..8f2d1c12a 100644 --- a/config/locales/app.public.es.yml +++ b/config/locales/app.public.es.yml @@ -147,19 +147,21 @@ es: projects_list: # projects gallery - the_fablab_projects: "Los proyectos del FabLab" - search_over_the_whole_network: "Buscar en toda la red de FabLab" - tooltip_openlab_projects_switch: "La busqueda en toda la red le permite buscar los proyectos de todos los FabLab que usan esta característica" - openlab_search_not_available_at_the_moment: "La busqueda en toda la red no está disponible en este momento. Puede seguir buscando proyectos en este FabLab." - project_search_result_is_empty: "Lo sentimos, no hemos encontrado nada." - reset_all_filters: "Limpiar filtros" - search: "Buscar" - all_projects: "Todos los proyectos" - my_projects: "Mis proyectos" - projects_to_whom_i_take_part_in: "Proyectos de los que formo parte" - all_machines: "Todas las máquinas" - all_materials: "Todo el material" - load_next_projects: "Cargar más proyectos" + projects_list: + the_fablab_projects: "Los proyectos del FabLab" + search_over_the_whole_network: "Buscar en toda la red de FabLab" + tooltip_openlab_projects_switch: "La busqueda en toda la red le permite buscar los proyectos de todos los FabLab que usan esta característica" + openlab_search_not_available_at_the_moment: "La busqueda en toda la red no está disponible en este momento. Puede seguir buscando proyectos en este FabLab." + project_search_result_is_empty: "Lo sentimos, no hemos encontrado nada." + reset_all_filters: "Limpiar filtros" + search: "Buscar" + all_projects: "Todos los proyectos" + my_projects: "Mis proyectos" + projects_to_whom_i_take_part_in: "Proyectos de los que formo parte" + all_machines: "Todas las máquinas" + all_materials: "Todo el material" + load_next_projects: "Cargar más proyectos" + rough_draft: "Borrador" projects_show: # details of a projet diff --git a/config/locales/app.public.fr.yml b/config/locales/app.public.fr.yml index 888f9b86a..40bcdcf89 100644 --- a/config/locales/app.public.fr.yml +++ b/config/locales/app.public.fr.yml @@ -148,19 +148,21 @@ fr: projects_list: # galerie des projets - the_fablab_projects: "Les projets du FabLab" - search_over_the_whole_network: "Chercher sur tout le réseau Fab Manager" - tooltip_openlab_projects_switch: "La recherche sur tout le réseau vous permet de rechercher parmis les projets de tous les Fab-managers utilisant cette fonctionnalité !" - openlab_search_not_available_at_the_moment: "La recherche sur tout le réseau n'est pas disponible pour le moment. Vous pouvez cependant effectuer une recherche parmis les projets de cette plateforme." - project_search_result_is_empty: "Il n'y a pas de projets correspondant à vos critères de recherche." - reset_all_filters: "Réinitialiser tous les filtres" - search: "Rechercher" - all_projects: "Tous les projets" - my_projects: "Mes projets" - projects_to_whom_i_take_part_in: "Les projets auxquels je collabore" - all_machines: "Toutes les machines" - all_materials: "Tous les matériaux" - load_next_projects: "Charger les projets suivants" + projects_list: + the_fablab_projects: "Les projets du FabLab" + search_over_the_whole_network: "Chercher sur tout le réseau Fab Manager" + tooltip_openlab_projects_switch: "La recherche sur tout le réseau vous permet de rechercher parmis les projets de tous les Fab-managers utilisant cette fonctionnalité !" + openlab_search_not_available_at_the_moment: "La recherche sur tout le réseau n'est pas disponible pour le moment. Vous pouvez cependant effectuer une recherche parmis les projets de cette plateforme." + project_search_result_is_empty: "Il n'y a pas de projets correspondant à vos critères de recherche." + reset_all_filters: "Réinitialiser tous les filtres" + search: "Rechercher" + all_projects: "Tous les projets" + my_projects: "Mes projets" + projects_to_whom_i_take_part_in: "Les projets auxquels je collabore" + all_machines: "Toutes les machines" + all_materials: "Tous les matériaux" + load_next_projects: "Charger les projets suivants" + rough_draft: "Brouillon" projects_show: # détails d'un projet diff --git a/config/locales/app.public.pt.yml b/config/locales/app.public.pt.yml index 936c986e9..ff163174e 100755 --- a/config/locales/app.public.pt.yml +++ b/config/locales/app.public.pt.yml @@ -148,19 +148,21 @@ pt: projects_list: # projects gallery - the_fablab_projects: "Projetos do Fab Lab" - search_over_the_whole_network: "Pesquisar em todos os FabLabs" - tooltip_openlab_projects_switch: "A busca em todos os FabLabs busca projetos em todos os FabLabs que usam o Fab-manager !" - openlab_search_not_available_at_the_moment: "A busca em toda a rede de FabLabs não está disponível no momento. Você pode procurar por projetos nesta plataforma." - project_search_result_is_empty: "Desculpe, nós não achamos nenhum resultado para sua pesquisa." - reset_all_filters: "Resetar todos os filtros" - search: "Procurar" - all_projects: "Todos os projetos" - my_projects: "Meus Projetos" - projects_to_whom_i_take_part_in: "Projetos que eu participo" - all_machines: "Todas as máquinas" - all_materials: "Todos os materiais" - load_next_projects: "Carregar próximos projetos" + projects_list: + the_fablab_projects: "Projetos do Fab Lab" + search_over_the_whole_network: "Pesquisar em todos os FabLabs" + tooltip_openlab_projects_switch: "A busca em todos os FabLabs busca projetos em todos os FabLabs que usam o Fab-manager !" + openlab_search_not_available_at_the_moment: "A busca em toda a rede de FabLabs não está disponível no momento. Você pode procurar por projetos nesta plataforma." + project_search_result_is_empty: "Desculpe, nós não achamos nenhum resultado para sua pesquisa." + reset_all_filters: "Resetar todos os filtros" + search: "Procurar" + all_projects: "Todos os projetos" + my_projects: "Meus Projetos" + projects_to_whom_i_take_part_in: "Projetos que eu participo" + all_machines: "Todas as máquinas" + all_materials: "Todos os materiais" + load_next_projects: "Carregar próximos projetos" + rough_draft: "Rascunho" projects_show: # details of a projet