From 233c0b0663a07da511f233caa52ba80781c3d9d3 Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Tue, 26 Mar 2019 18:55:20 +0100 Subject: [PATCH] gui: ReDownload must not delete original --- changelog-fr.md | 4 ++++ changelog.md | 4 ++++ src/be/nikiroo/fanfix/bundles/StringIdGui.java | 4 ++-- src/be/nikiroo/fanfix/bundles/resources_gui.properties | 6 +++--- src/be/nikiroo/fanfix/bundles/resources_gui_fr.properties | 6 +++--- src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java | 4 +--- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/changelog-fr.md b/changelog-fr.md index dcabaee..e7989d0 100644 --- 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 e6b2af1..4bf7154 100644 --- 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 e31da64..8d3022e 100644 --- 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 30a48c6..5e49ceb 100644 --- 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 0dd0f97..6e14c98 100644 --- 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 d4cfb81..4c65972 100644 --- 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)); } } }); -- 2.27.0