From ead7e79f012260434518372cf3d908dbefdfe36b Mon Sep 17 00:00:00 2001 From: Vincent Date: Tue, 4 Jul 2023 16:57:41 +0200 Subject: [PATCH 1/4] (ui) Fix projects filters font-weight --- app/frontend/src/stylesheets/modules/projects/projects.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/frontend/src/stylesheets/modules/projects/projects.scss b/app/frontend/src/stylesheets/modules/projects/projects.scss index c317c356e..b8ce90a45 100644 --- a/app/frontend/src/stylesheets/modules/projects/projects.scss +++ b/app/frontend/src/stylesheets/modules/projects/projects.scss @@ -16,6 +16,7 @@ @include header(); padding-top: 0; } + label { font-weight: 400; } .switch { display: flex; justify-content: space-between; From 168d804eb9491a6259db8a8e7604652df8211112 Mon Sep 17 00:00:00 2001 From: Du Peng Date: Tue, 4 Jul 2023 16:14:55 +0200 Subject: [PATCH 2/4] (bug) variable is not defined --- app/frontend/src/javascript/controllers/projects.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/frontend/src/javascript/controllers/projects.js b/app/frontend/src/javascript/controllers/projects.js index de52f50f5..c90980add 100644 --- a/app/frontend/src/javascript/controllers/projects.js +++ b/app/frontend/src/javascript/controllers/projects.js @@ -322,8 +322,8 @@ Application.Controllers.controller('ProjectsController', ['$scope', '$state', 'P $location.$$search.member_id = ''; } - fromDate = $location.$$search.from_date ? new Date($location.$$search.from_date) : undefined; - toDate = $location.$$search.to_date ? new Date($location.$$search.to_date) : undefined; + const fromDate = $location.$$search.from_date ? new Date($location.$$search.from_date) : undefined; + const toDate = $location.$$search.to_date ? new Date($location.$$search.to_date) : undefined; // default search parameters $scope.search = { From ab5497dcc660e34e390e1771abab5d85fd0cde32 Mon Sep 17 00:00:00 2001 From: Du Peng Date: Tue, 4 Jul 2023 17:00:13 +0200 Subject: [PATCH 3/4] (bug) unable to show project step image in markdown file --- CHANGELOG.md | 2 ++ app/services/project_to_markdown.rb | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec5c8cf7e..6bc93531c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog Fab-manager +- Fix a bug: unable to show project step image in markdown file + ## v6.0.8 2023 July 03 - Improved projects list filter diff --git a/app/services/project_to_markdown.rb b/app/services/project_to_markdown.rb index 7f3521ff0..d09e42033 100644 --- a/app/services/project_to_markdown.rb +++ b/app/services/project_to_markdown.rb @@ -24,7 +24,7 @@ class ProjectToMarkdown md << ReverseMarkdown.convert(project_step.description.to_s) project_step.project_step_images.each_with_index do |image, i| - md << "![#{I18n.t('app.shared.project.step_image')} #{i+1}](#{full_url(project.project_image.attachment.url)})" + md << "![#{I18n.t('app.shared.project.step_image')} #{i+1}](#{full_url(image.attachment.url)})" end end end @@ -85,4 +85,4 @@ class ProjectToMarkdown def full_url(path) "#{Rails.application.routes.url_helpers.root_url[...-1]}#{path}" end -end \ No newline at end of file +end From 6e014ddfe615c5c359eeb0674961f0d30d69c9bd Mon Sep 17 00:00:00 2001 From: Du Peng Date: Tue, 4 Jul 2023 17:09:25 +0200 Subject: [PATCH 4/4] (i18n) update translations --- config/locales/app.admin.fr.yml | 18 +++++++++--------- config/locales/app.public.fr.yml | 12 ++++++------ config/locales/app.shared.fr.yml | 4 ++-- config/locales/fr.yml | 8 ++++---- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 4bc83e3aa..0f2daaeac 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -415,8 +415,8 @@ fr: add_a_material: "Ajouter un matériau" themes: "Thématiques" add_a_new_theme: "Ajouter une nouvelle thématique" - project_categories: "Categories" - add_a_new_project_category: "Add a new category" + project_categories: "Catégories" + add_a_new_project_category: "Ajouter une nouvelle catégorie" licences: "Licences" statuses: "Statuts" description: "Description" @@ -447,10 +447,10 @@ fr: open_lab_app_secret: "Secret" openlab_default_info_html: "Dans la galerie de projets, les visiteurs peuvent choisir entre deux vues : tous les projets de l'ensemble du réseau OpenLab, ou uniquement les projets documentés dans votre Fab Lab.
Ici, vous pouvez choisir quelle vue est affichée par défaut." default_to_openlab: "Afficher OpenLab par défaut" - filters: Projects list filters - project_categories: Categories + filters: Filtres de la liste des projets + project_categories: Catégories project_categories: - name: "Name" + name: "Nom" projects_setting: add: "Ajouter" actions_controls: "Actions" @@ -1779,10 +1779,10 @@ fr: extended_prices_in_same_day: "Prix étendus le même jour" public_registrations: "Inscriptions publiques" show_username_in_admin_list: "Afficher le nom d'utilisateur dans la liste" - projects_list_member_filter_presence: "Presence of member filter on projects list" - projects_list_date_filters_presence: "Presence of date filters on projects list" - project_categories_filter_placeholder: "Placeholder for categories filter in project gallery" - project_categories_wording: "Wording used to replace \"Categories\" on public pages" + projects_list_member_filter_presence: "Présence de filtre des membres dans la liste des projets" + projects_list_date_filters_presence: "Filtres de date présents dans la liste des projets" + project_categories_filter_placeholder: "Placeholder pour le filtre des catégories dans la galerie de projet" + project_categories_wording: "Mots utilisés pour remplacer les \"catégories\" sur les pages publiques" overlapping_options: training_reservations: "Formations" machine_reservations: "Machines" diff --git a/config/locales/app.public.fr.yml b/config/locales/app.public.fr.yml index 26d8ac301..dbab0f257 100644 --- a/config/locales/app.public.fr.yml +++ b/config/locales/app.public.fr.yml @@ -167,7 +167,7 @@ fr: full_price: "Plein tarif : " #projects gallery projects_list: - filter: Filter + filter: Filtre the_fablab_projects: "Les projets" add_a_project: "Ajouter un projet" network_search: "Réseau Fab-Manager" @@ -184,10 +184,10 @@ fr: all_materials: "Tous les matériaux" load_next_projects: "Charger les projets suivants" rough_draft: "Brouillon" - filter_by_member: "Filter by member" - created_from: Created from - created_to: Created to - download_archive: Download + filter_by_member: "Filtrer par membre" + created_from: Créé depuis + created_to: Créés le + download_archive: Télécharger status_filter: all_statuses: "Tous les statuts" select_status: "Sélectionnez un statut" @@ -221,7 +221,7 @@ fr: report: "Signaler" do_you_really_want_to_delete_this_project: "Êtes-vous sur de vouloir supprimer ce projet ?" status: "Statut" - markdown_file: "Markdown file" + markdown_file: "Fichier Markdown" #list of machines machines_list: the_fablab_s_machines: "Les machines" diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml index 8bf660c5d..1f683472f 100644 --- a/config/locales/app.shared.fr.yml +++ b/config/locales/app.shared.fr.yml @@ -131,7 +131,7 @@ fr: illustration: "Illustration" add_an_illustration: "Ajouter un visuel" CAD_file: "Fichier CAO" - CAD_files: "CAD files" + CAD_files: "Fichiers CAD" allowed_extensions: "Extensions autorisées :" add_a_new_file: "Ajouter un nouveau fichier" description: "Description" @@ -151,7 +151,7 @@ fr: employed_materials: "Matériaux utilisés" employed_machines: "Machines utilisées" collaborators: "Les collaborateurs" - author: Author + author: Auteur creative_commons_licences: "Licences Creative Commons" licence: "Licence" themes: "Thématiques" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 6d8a4588f..054f07896 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -697,10 +697,10 @@ fr: trainings_authorization_validity_duration: "Durée de la période de validité des formations" trainings_invalidation_rule: "Invalidation automatique des formations" trainings_invalidation_rule_period: "Période de grâce avant d'invalider une formation" - projects_list_member_filter_presence: "Presence of member filter on projects list" - projects_list_date_filters_presence: "Presence of dates filter on projects list" - project_categories_filter_placeholder: "Placeholder for categories filter in project gallery" - project_categories_wording: "Wording used to replace \"Categories\" on public pages" + projects_list_member_filter_presence: "Présence de filtre des membres dans la liste des projets" + projects_list_date_filters_presence: "Filtre de présence de dates sur la liste des projets" + project_categories_filter_placeholder: "Placeholder pour le filtre des catégories dans la galerie de projet" + project_categories_wording: "Mots utilisés pour remplacer les \"catégories\" sur les pages publiques" #statuses of projects statuses: new: "Nouveau"