From 15dbfdc214c804c9d7b823ea2308876ea1b910af Mon Sep 17 00:00:00 2001 From: Atmis Date: Tue, 22 Apr 2014 23:52:27 +0200 Subject: [PATCH 1/4] Update fr.yml Manque encore download entries --- config/locales/fr.yml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/config/locales/fr.yml b/config/locales/fr.yml index b8a6e627..555ccc47 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -273,29 +273,29 @@ fr: label_my_open_approvals: Mes approbations en attente label_my_locked_documents: Mes documents verrouillés - title_create_link: Create a symbolic link - label_link_from: Link from - label_link_to: Link to + title_create_link: Créer un lien symbolique + label_link_from: Lien depuis + label_link_to: Lien vers label_notifications_on: Notifications on label_notifications_off: Notifications off - field_target_file: Source file + field_target_file: Fichier source title_download_entries: Download entries - label_link_name: Link name - label_target_folder: Target folder - label_source_folder: Source folder - label_target_project: Target project - label_source_project: Source project + label_link_name: Nom du lien + label_target_folder: Dossier cible + label_source_folder: Dossier source + label_target_project: Projet cible + label_source_project: Projet source - text_email_doc_updated_subject: "Documents of %{project} updated" - text_email_doc_updated: has just actualized documents of - text_email_doc_follows: as follows - text_email_doc_deleted_subject: "Documents of %{project} deleted" - text_email_doc_deleted: has just deleted documents of - label_links_only: links only + text_email_doc_updated_subject: "Documents de %{project} mis à jour" + text_email_doc_updated: a mis à jour des documents de + text_email_doc_follows: comme suit + text_email_doc_deleted_subject: "Documents de %{project} supprimés" + text_email_doc_deleted: a supprimé des documents de + label_links_only: liens seulement - label_display_notified_recipients: Display notified recipients - note_display_notified_recipients: The user will be informed about all recipients of just sent the email notification. - warning_email_notifications: "Email notifications sent to %{to}" + label_display_notified_recipients: Afficher les destinataires notifiés + note_display_notified_recipients: "L'utilisateur sera informé de tous les destinataires à qui un email de notifcation a été envoyé" + warning_email_notifications: "Email de notification envoyé à %{to}" my: blocks: @@ -303,4 +303,4 @@ fr: open_approvals: Approbations en attente label_maximum_ajax_upload_filesize: Taille maximale de fichier pour téléversement via AJAX - note_maximum_ajax_upload_filesize: "Taille maximale, en méga octets, de fichier pour téléversement via l'interface standard AJAX. Sinon l'interface standard de Redmine doit être utilisée." \ No newline at end of file + note_maximum_ajax_upload_filesize: "Taille maximale, en méga octets, de fichier pour téléversement via l'interface standard AJAX. Sinon l'interface standard de Redmine doit être utilisée." From cc4b413a90a021e84cc53e6add59604b206392dd Mon Sep 17 00:00:00 2001 From: Atmis Date: Wed, 23 Apr 2014 00:12:54 +0200 Subject: [PATCH 2/4] Update fr.yml --- config/locales/fr.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 555ccc47..73aaaed9 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -136,7 +136,7 @@ fr: note_stem_some: "Rechercher des stemmes pour tous les mots sauf ceux qui commencent par des majuscules, ceux suivis d'un certain nombre de caractères ou ceux utilisés avec des opérateurs nécessitant des informations contextuelles. Les stemmes doivent être préfixées par 'Z'." note_stem_all: "Rechercher toutes les racines de tous les mots (note : le préfix 'Z' ne sera pas ajouté)." note_stemming_applied: Il est à noter que l'algorithme de racinisation ne sera appliqué qu'aux mots in probabilistic fields - Les filtres booléans ne seront pas racinisés. - label_default_notifications: Les notifications par défaut du document + label_default_notifications: Notifications par défaut du document heading_uploaded_files: Document(s) transmis submit_commit: Appliquer link_documents: Documents @@ -276,10 +276,10 @@ fr: title_create_link: Créer un lien symbolique label_link_from: Lien depuis label_link_to: Lien vers - label_notifications_on: Notifications on - label_notifications_off: Notifications off + label_notifications_on: Activer les notifications + label_notifications_off: Désactiver les notifications field_target_file: Fichier source - title_download_entries: Download entries + title_download_entries: Historique des téléchargements label_link_name: Nom du lien label_target_folder: Dossier cible label_source_folder: Dossier source From e721caa792be12bfae1328b8b047b704d79dc754 Mon Sep 17 00:00:00 2001 From: Karel Picman Date: Mon, 28 Apr 2014 14:27:32 +0200 Subject: [PATCH 3/4] DMSF URL links backward compatibility --- config/routes.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index c099a4a4..869ae89c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,8 +1,8 @@ # Redmine plugin for Document Management System "Features" # -# Copyright (C) 2011 Vít Jonáš -# Copyright (C) 2012 Daniel Munn -# Copyright (C) 2013 Karel Pičman +# Copyright (C) 2011 Vít Jonáš +# Copyright (C) 2012 Daniel Munn +# Copyright (C) 2011-14 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -72,8 +72,11 @@ RedmineApp::Application.routes.draw do get '/dmsf/files/:id/revision/delete', :controller => 'dmsf_files', :action => 'delete_revision', :as => 'delete_revision' get '/dmsf/files/:id/download', :controller => 'dmsf_files', :action => 'show', :download => '' # Otherwise will not route nil download param get '/dmsf/files/:id/download/:download', :controller => 'dmsf_files', :action => 'show' - get '/dmsf/files/:id', :controller => 'dmsf_files', :action => 'show', :as => 'dmsf_file' + get '/dmsf/files/:id', :controller => 'dmsf_files', :action => 'show', :as => 'dmsf_file' delete '/dmsf/files/:id', :controller => 'dmsf_files', :action => 'delete' + + # Just to keep backward compatibility with old external direct links + get '/dmsf_files/:id', :controller => 'dmsf_files', :action => 'show' # # files_copy controller From bf5e3ab4e676767501402b06331e5f600a3aba50 Mon Sep 17 00:00:00 2001 From: Karel Picman Date: Mon, 28 Apr 2014 16:28:10 +0200 Subject: [PATCH 4/4] DMSF URL links backward compatibility --- config/routes.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/routes.rb b/config/routes.rb index 869ae89c..2907fc7c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -77,6 +77,7 @@ RedmineApp::Application.routes.draw do # Just to keep backward compatibility with old external direct links get '/dmsf_files/:id', :controller => 'dmsf_files', :action => 'show' + get '/dmsf_files/:id/download', :controller => 'dmsf_files', :action => 'show', :download => '' # # files_copy controller