gui: ReDownload must not delete original

diff --git a/changelog-fr.md b/changelog-fr.md
index dcabaeec002daf5e7244cc24bfa53b024f9ab9ef..e7989d0b32aa101cb1133707da8d1508ceddd6f0 100644 (file)
--- a/changelog-fr.md
+++ b/changelog-fr.md
@@ -2,7 +2,11 @@
 
 # Version WIP
 
+- i18n: changer la langue dans les options fonctionne aussi quand $LANG existe
 - gui: traduction en français
+- gui: ReDownloader ne supprimer plus le livre original
+- fix: corrections pour le visionneur interne
+- fix: quelques corrections pour les traductions
 
 # Version 2.0.1
 

diff --git a/changelog.md b/changelog.md
index e6b2af1fcb44d6895bc57eff2ba289bf3aeb481a..4bf7154412e3c87695f159eb4fcf5bcc67abc190 100644 (file)
--- a/changelog.md
+++ b/changelog.md
@@ -2,7 +2,11 @@
 
 # Version WIP
 
+- i18n: setting the language in the option panel now works even with $LANG set
 - gui: translated into French
+- gui: ReDownload does not delete the original book anymore
+- gui: internal viewer fixes 
+- gui: some translation fixes
 
 # Version 2.0.1
 

diff --git a/src/be/nikiroo/fanfix/bundles/StringIdGui.java b/src/be/nikiroo/fanfix/bundles/StringIdGui.java
index e31da64d4427e8251a5ff1ea5dcde462c4d36172..8d3022e708037b3753fe898dd701c8c535a256c0 100644 (file)
--- a/src/be/nikiroo/fanfix/bundles/StringIdGui.java
+++ b/src/be/nikiroo/fanfix/bundles/StringIdGui.java
@@ -139,10 +139,10 @@ public enum StringIdGui {
        MENU_AUTHORS_UNKNOWN, //
 
        // Progress names
-       @Meta(def = "Removing old copy", format = Format.STRING, description = "progress bar caption for the 'removing old copy' step of 'redownload'")
-       PROGRESS_REDOWNLOAD_REMOVE_OLD_COPY, //
        @Meta(def = "Reload books", format = Format.STRING, description = "progress bar caption for the 'reload books' step of all outOfUi operations")
        PROGRESS_OUT_OF_UI_RELOAD_BOOKS, //
+       @Meta(def = "Change the source of the book to %s", format = Format.STRING, description = "progress bar caption for the 'change source' step of the ReDownload operation", info = "%s = new source name")
+       PROGRESS_CHANGE_SOURCE, //
 
        // Error messages
        @Meta(def = "An error occured when contacting the library", format = Format.STRING, description = "default description if the error is not known")

diff --git a/src/be/nikiroo/fanfix/bundles/resources_gui.properties b/src/be/nikiroo/fanfix/bundles/resources_gui.properties
index 30a48c68e634ac1c8309bfca907a8ecd76e3c6b0..5e49ceb43b3638a8fbb02dbf8f205f5369acd8f9 100644 (file)
--- a/src/be/nikiroo/fanfix/bundles/resources_gui.properties
+++ b/src/be/nikiroo/fanfix/bundles/resources_gui.properties
@@ -151,12 +151,12 @@ MENU_XXX_ALL_LISTING = Listing
 # a special menu button to select the books without author
 # (FORMAT: STRING) 
 MENU_AUTHORS_UNKNOWN = [unknown]
-# progress bar caption for the 'removing old copy' step of 'redownload'
-# (FORMAT: STRING) 
-PROGRESS_REDOWNLOAD_REMOVE_OLD_COPY = Removing old copy
 # progress bar caption for the 'reload books' step of all outOfUi operations
 # (FORMAT: STRING) 
 PROGRESS_OUT_OF_UI_RELOAD_BOOKS = Reload books
+# progress bar caption for the 'change source' step of the ReDownload operation
+# (FORMAT: STRING) %s = new source name
+PROGRESS_CHANGE_SOURCE = Change the source of the book to %s
 # default description if the error is not known
 # (FORMAT: STRING) 
 ERROR_LIB_STATUS = An error occured when contacting the library

diff --git a/src/be/nikiroo/fanfix/bundles/resources_gui_fr.properties b/src/be/nikiroo/fanfix/bundles/resources_gui_fr.properties
index 0dd0f97001e99c3fedfca4e183664b7305e00170..6e14c98ffd670567b8db41f2fab2586ffb60e282 100644 (file)
--- a/src/be/nikiroo/fanfix/bundles/resources_gui_fr.properties
+++ b/src/be/nikiroo/fanfix/bundles/resources_gui_fr.properties
@@ -151,12 +151,12 @@ MENU_XXX_ALL_LISTING = Listing
 # a special menu button to select the books without author
 # (FORMAT: STRING) 
 MENU_AUTHORS_UNKNOWN = [inconnu]
-# progress bar caption for the 'removing old copy' step of 'redownload'
-# (FORMAT: STRING) 
-PROGRESS_REDOWNLOAD_REMOVE_OLD_COPY = Suppression de l'ancienne version
 # progress bar caption for the 'reload books' step of all outOfUi operations
 # (FORMAT: STRING) 
 PROGRESS_OUT_OF_UI_RELOAD_BOOKS = Recharger les livres
+# progress bar caption for the 'change source' step of the ReDownload operation
+# (FORMAT: STRING) %s = new source name
+PROGRESS_CHANGE_SOURCE = Change la source du livre en %s
 # default description if the error is not known
 # (FORMAT: STRING) 
 ERROR_LIB_STATUS = Une erreur est survenue en contactant la librairie

diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java b/src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java
index d4cfb8175959984f1760af7bab52fed57cd5396b..4c65972a2d81e710eb636bdbd7a8894335020d17 100644 (file)
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java
@@ -723,8 +723,6 @@ class GuiReaderFrame extends JFrame implements FrameHelper {
                                                        new StoryRunnable() {
                                                                @Override
                                                                public void run(Story story) {
-                                                                       reader.delete(meta.getLuid());
-                                                                       mainPanel.unsetSelectedBook();
                                                                        MetaData newMeta = story.getMeta();
                                                                        if (!newMeta.getSource().equals(
                                                                                        meta.getSource())) {
@@ -734,7 +732,7 @@ class GuiReaderFrame extends JFrame implements FrameHelper {
                                                                }
                                                        },
                                                        GuiReader
-                                                                       .trans(StringIdGui.PROGRESS_REDOWNLOAD_REMOVE_OLD_COPY));
+                                                                       .trans(StringIdGui.PROGRESS_CHANGE_SOURCE));
                                }
                        }
                });