Moved Localization support to Tools package to enable it to be more e…

…asily used from other packages.

DataModel/src/main/java/com/gmail/dpierron/calibre/datamodel/NoiseWord.java

@@ -1,5 +1,7 @@
 package com.gmail.dpierron.calibre.datamodel;
 
+import com.gmail.dpierron.tools.i18n.Localization;
+
 import java.util.*;
 
 public enum NoiseWord {
@@ -13,6 +15,7 @@ public enum NoiseWord {
   private static final NoiseWord DEFAULT = EN;
 
   private NoiseWord(String lang, String... words) {
+    String langnoiseWords = Localization.Main.getText("i18n.noiseWords");
     List<String> temp = Arrays.asList(words);
     this.noiseWords = new LinkedList<String>();
     for (String s : temp) {

OpdsOutput/src/main/java/Runner.java

@@ -1,21 +1,18 @@
-import com.gmail.dpierron.calibre.configuration.Configuration;
 import com.gmail.dpierron.calibre.configuration.ConfigurationManager;
 import com.gmail.dpierron.calibre.datamodel.test.TestDataModel;
 import com.gmail.dpierron.calibre.gui.Mainframe;
 import com.gmail.dpierron.calibre.opds.Catalog;
 import com.gmail.dpierron.calibre.opds.Constants;
 import com.gmail.dpierron.calibre.opds.Log4jCatalogCallback;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
-import com.gmail.dpierron.calibre.opds.i18n.LocalizationHelper;
+import com.gmail.dpierron.tools.i18n.Localization;
+import com.gmail.dpierron.tools.i18n.LocalizationHelper;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Locale;
 import java.util.Vector;
 

OpdsOutput/src/main/java/com/gmail/dpierron/calibre/configuration/ConfigurationManager.java

@@ -3,8 +3,8 @@
 import com.gmail.dpierron.calibre.datamodel.EBookFormat;
 import com.gmail.dpierron.calibre.opds.Constants;
 import com.gmail.dpierron.calibre.opds.JDOM;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
-import com.gmail.dpierron.calibre.opds.i18n.LocalizationHelper;
+import com.gmail.dpierron.tools.i18n.Localization;
+import com.gmail.dpierron.tools.i18n.LocalizationHelper;
 import com.gmail.dpierron.tools.Helper;
 import org.apache.log4j.Logger;
 

OpdsOutput/src/main/java/com/gmail/dpierron/calibre/configuration/DefaultConfigurationSettings.java

@@ -3,8 +3,7 @@
 /**
  * These are the default setting for the Calibre2opds configuration
  */
-import com.gmail.dpierron.calibre.opds.Constants;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
+import com.gmail.dpierron.tools.i18n.Localization;
 import com.gmail.dpierron.calibre.opds.indexer.Index;
 
 import java.io.File;

OpdsOutput/src/main/java/com/gmail/dpierron/calibre/gui/ConfigureLoggingDialog.java

@@ -11,13 +11,7 @@
 
 package com.gmail.dpierron.calibre.gui;
 
-import com.gmail.dpierron.calibre.configuration.ConfigurationManager;
-import com.gmail.dpierron.calibre.opds.CatalogManager;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
-import com.gmail.dpierron.tools.Helper;
-
-import javax.swing.*;
-import java.io.File;
+import com.gmail.dpierron.tools.i18n.Localization;
 
 
 /**

OpdsOutput/src/main/java/com/gmail/dpierron/calibre/gui/GenerateCatalogDialog.java

@@ -12,9 +12,8 @@
 package com.gmail.dpierron.calibre.gui;
 
 import com.gmail.dpierron.calibre.opds.*;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
+import com.gmail.dpierron.tools.i18n.Localization;
 import com.gmail.dpierron.tools.Helper;
-import com.sun.corba.se.impl.orbutil.graph.Graph;
 import org.apache.log4j.Logger;
 
 import javax.swing.*;

OpdsOutput/src/main/java/com/gmail/dpierron/calibre/gui/Mainframe.java

@@ -11,19 +11,17 @@
 
 import com.gmail.dpierron.calibre.configuration.*;
 import com.gmail.dpierron.calibre.database.DatabaseManager;
-import com.gmail.dpierron.calibre.datamodel.EBookFormat;
 import com.gmail.dpierron.calibre.gui.table.ButtonColumn;
 import com.gmail.dpierron.calibre.gui.table.CustomCatalogTableModel;
 import com.gmail.dpierron.calibre.opds.Catalog;
 import com.gmail.dpierron.calibre.opds.Constants;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
-import com.gmail.dpierron.calibre.opds.i18n.LocalizationHelper;
+import com.gmail.dpierron.tools.i18n.Localization;
+import com.gmail.dpierron.tools.i18n.LocalizationHelper;
 import com.gmail.dpierron.calibre.opds.indexer.Index;
 import com.gmail.dpierron.tools.Helper;
 import com.gmail.dpierron.tools.OS;
 import com.l2fprod.common.swing.JDirectoryChooser;
 import org.apache.log4j.Logger;
-import sun.security.krb5.Config;
 
 import javax.swing.*;
 import javax.swing.border.Border;
@@ -621,6 +619,8 @@ private void changeLanguage() {
     if (Helper.checkedCompare(language, newLanguage) != 0) {
       currentProfile.setLanguage(newLanguage);
       language = newLanguage;
+      Localization.Main.setProgileLanguage(currentProfile.getLanguage());
+      Localization.Enum.setProgileLanguage(currentProfile.getLanguage());
       Localization.Main.reloadLocalizations();
       Localization.Enum.reloadLocalizations();
       translateTexts();

OpdsOutput/src/main/java/com/gmail/dpierron/calibre/gui/ProfileManagerDialog.java

@@ -12,8 +12,7 @@
 package com.gmail.dpierron.calibre.gui;
 
 import com.gmail.dpierron.calibre.configuration.ConfigurationManager;
-import com.gmail.dpierron.calibre.opds.CatalogManager;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
+import com.gmail.dpierron.tools.i18n.Localization;
 import com.gmail.dpierron.tools.Helper;
 
 import javax.swing.*;

OpdsOutput/src/main/java/com/gmail/dpierron/calibre/gui/ReprocessEpubMetadataDialog.java

@@ -5,7 +5,7 @@
 import com.gmail.dpierron.calibre.datamodel.DataModel;
 import com.gmail.dpierron.calibre.datamodel.Tag;
 import com.gmail.dpierron.calibre.opds.Catalog;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
+import com.gmail.dpierron.tools.i18n.Localization;
 import com.gmail.dpierron.calibre.opf.OpfOutput;
 import com.gmail.dpierron.tools.Helper;
 import org.apache.log4j.Logger;

OpdsOutput/src/main/java/com/gmail/dpierron/calibre/gui/guiField.java

@@ -14,14 +14,12 @@
 
 import com.gmail.dpierron.calibre.configuration.ConfigurationHolder;
 import com.gmail.dpierron.calibre.configuration.ConfigurationManager;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
-import com.gmail.dpierron.calibre.opds.indexer.Index;
+import com.gmail.dpierron.tools.i18n.Localization;
 import com.gmail.dpierron.tools.Helper;
 import org.apache.log4j.Logger;
 
 import java.io.File;
 import javax.swing.*;
-import javax.swing.text.StringContent;
 import java.lang.reflect.*;
 
 public class guiField {

OpdsOutput/src/main/java/com/gmail/dpierron/calibre/gui/table/CustomCatalogTableModel.java

@@ -2,8 +2,7 @@
 
 import com.gmail.dpierron.calibre.configuration.CustomCatalogEntry;
 import com.gmail.dpierron.calibre.opds.Constants;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
-import com.gmail.dpierron.tools.Composite;
+import com.gmail.dpierron.tools.i18n.Localization;
 
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;

OpdsOutput/src/main/java/com/gmail/dpierron/calibre/opds/AllBooksSubCatalog.java

@@ -6,16 +6,12 @@
  *     -> SubCatalog
  */
 
-import com.gmail.dpierron.calibre.configuration.Icons;
 import com.gmail.dpierron.calibre.datamodel.Book;
 import com.gmail.dpierron.calibre.datamodel.Series;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
-import com.gmail.dpierron.tools.Composite;
+import com.gmail.dpierron.tools.i18n.Localization;
 import com.gmail.dpierron.tools.Helper;
 import org.apache.log4j.Logger;
-import org.jdom.Element;
 
-import java.io.IOException;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;

OpdsOutput/src/main/java/com/gmail/dpierron/calibre/opds/AuthorsSubCatalog.java

@@ -13,7 +13,7 @@
 import com.gmail.dpierron.calibre.datamodel.Book;
 import com.gmail.dpierron.calibre.datamodel.DataModel;
 import com.gmail.dpierron.calibre.datamodel.Series;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
+import com.gmail.dpierron.tools.i18n.Localization;
 import com.gmail.dpierron.calibre.trook.TrookSpecificSearchDatabaseManager;
 import com.gmail.dpierron.tools.Helper;
 import org.apache.log4j.Logger;

OpdsOutput/src/main/java/com/gmail/dpierron/calibre/opds/BooksSubCatalog.java

@@ -14,8 +14,8 @@
 import com.gmail.dpierron.calibre.configuration.ConfigurationManager;
 import com.gmail.dpierron.calibre.configuration.DeviceMode;
 import com.gmail.dpierron.calibre.datamodel.*;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
-import com.gmail.dpierron.calibre.opds.i18n.LocalizationHelper;
+import com.gmail.dpierron.tools.i18n.Localization;
+import com.gmail.dpierron.tools.i18n.LocalizationHelper;
 import com.gmail.dpierron.calibre.opds.indexer.IndexManager;
 import com.gmail.dpierron.calibre.trook.TrookSpecificSearchDatabaseManager;
 import com.gmail.dpierron.tools.Helper;

OpdsOutput/src/main/java/com/gmail/dpierron/calibre/opds/Catalog.java

@@ -18,7 +18,7 @@
 import com.gmail.dpierron.calibre.error.CalibreSavedSearchNotFoundException;
 import com.gmail.dpierron.calibre.gui.CatalogCallbackInterface;
 import com.gmail.dpierron.calibre.gui.GenerationStoppedException;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
+import com.gmail.dpierron.tools.i18n.Localization;
 import com.gmail.dpierron.calibre.opds.indexer.IndexManager;
 import com.gmail.dpierron.calibre.opf.OpfOutput;
 import com.gmail.dpierron.calibre.trook.TrookSpecificSearchDatabaseManager;
@@ -560,6 +560,8 @@ public void createMainCatalog() throws IOException {
     CatalogManager.INSTANCE.coverManager.reset();
     CachedFileManager.INSTANCE.reset();
 
+    Localization.Main.setProgileLanguage(currentProfile.getLanguage());
+    Localization.Enum.setProgileLanguage(currentProfile.getLanguage());
     Localization.Main.reloadLocalizations();
     Localization.Enum.reloadLocalizations();
 

OpdsOutput/src/main/java/com/gmail/dpierron/calibre/opds/Constants.java

@@ -7,7 +7,7 @@
  * once they have been genrated.
  */
 import com.gmail.dpierron.calibre.configuration.Icons;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
+import com.gmail.dpierron.tools.i18n.Localization;
 import com.gmail.dpierron.tools.Helper;
 
 import java.io.BufferedReader;

OpdsOutput/src/main/java/com/gmail/dpierron/calibre/opds/FeaturedBooksSubCatalog.java

@@ -4,8 +4,7 @@
  */
 import com.gmail.dpierron.calibre.configuration.Icons;
 import com.gmail.dpierron.calibre.datamodel.Book;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
-import com.gmail.dpierron.tools.Composite;
+import com.gmail.dpierron.tools.i18n.Localization;
 import com.gmail.dpierron.tools.Helper;
 import org.apache.log4j.Logger;
 import org.jdom.Element;

OpdsOutput/src/main/java/com/gmail/dpierron/calibre/opds/HtmlManager.java

@@ -9,7 +9,7 @@
  */
 
 import com.gmail.dpierron.calibre.configuration.ConfigurationManager;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
+import com.gmail.dpierron.tools.i18n.Localization;
 import com.gmail.dpierron.tools.Helper;
 import org.apache.log4j.Logger;
 import org.jdom.Document;

OpdsOutput/src/main/java/com/gmail/dpierron/calibre/opds/ImageManager.java

@@ -7,14 +7,12 @@
 import com.gmail.dpierron.calibre.cache.CachedFileManager;
 import com.gmail.dpierron.calibre.configuration.ConfigurationManager;
 import com.gmail.dpierron.calibre.datamodel.Book;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
+import com.gmail.dpierron.tools.i18n.Localization;
 import com.gmail.dpierron.calibre.thumbnails.CreateThumbnail;
 import com.gmail.dpierron.tools.Helper;
 import org.apache.log4j.Logger;
 
 import java.io.*;
-import java.util.HashMap;
-import java.util.Map;
 
 
 public abstract class ImageManager {

OpdsOutput/src/main/java/com/gmail/dpierron/calibre/opds/JDOM.java

@@ -2,7 +2,7 @@
 
 import com.gmail.dpierron.calibre.configuration.ConfigurationManager;
 import com.gmail.dpierron.calibre.datamodel.DataModel;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
+import com.gmail.dpierron.tools.i18n.Localization;
 import com.gmail.dpierron.tools.Helper;
 import org.apache.log4j.Logger;
 import org.jdom.*;

OpdsOutput/src/main/java/com/gmail/dpierron/calibre/opds/LevelSubCatalog.java

@@ -9,7 +9,7 @@
 import com.gmail.dpierron.calibre.datamodel.filter.BookFilter;
 import com.gmail.dpierron.calibre.datamodel.filter.FilterHelper;
 import com.gmail.dpierron.calibre.gui.CatalogCallbackInterface;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
+import com.gmail.dpierron.tools.i18n.Localization;
 import com.gmail.dpierron.tools.Composite;
 import com.gmail.dpierron.tools.Helper;
 import org.apache.log4j.Logger;

OpdsOutput/src/main/java/com/gmail/dpierron/calibre/opds/Log4jCatalogCallback.java

@@ -8,8 +8,8 @@
 import com.gmail.dpierron.calibre.configuration.GetConfigurationInterface;
 import com.gmail.dpierron.calibre.gui.CatalogCallbackInterface;
 import com.gmail.dpierron.calibre.gui.GenerationStoppedException;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
-import com.gmail.dpierron.calibre.opds.i18n.LocalizationHelper;
+import com.gmail.dpierron.tools.i18n.Localization;
+import com.gmail.dpierron.tools.i18n.LocalizationHelper;
 import com.gmail.dpierron.tools.Helper;
 import org.apache.log4j.Logger;
 

OpdsOutput/src/main/java/com/gmail/dpierron/calibre/opds/RatingsSubCatalog.java

@@ -4,8 +4,8 @@
 import com.gmail.dpierron.calibre.datamodel.Book;
 import com.gmail.dpierron.calibre.datamodel.BookRating;
 import com.gmail.dpierron.calibre.datamodel.Option;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
-import com.gmail.dpierron.calibre.opds.i18n.LocalizationHelper;
+import com.gmail.dpierron.tools.i18n.Localization;
+import com.gmail.dpierron.tools.i18n.LocalizationHelper;
 import com.gmail.dpierron.tools.Helper;
 import org.apache.log4j.Logger;
 import org.jdom.Element;

OpdsOutput/src/main/java/com/gmail/dpierron/calibre/opds/RecentBooksSubCatalog.java

@@ -3,8 +3,7 @@
 import com.gmail.dpierron.calibre.configuration.Icons;
 import com.gmail.dpierron.calibre.datamodel.Book;
 import com.gmail.dpierron.calibre.datamodel.Option;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
-import com.gmail.dpierron.tools.Composite;
+import com.gmail.dpierron.tools.i18n.Localization;
 import com.gmail.dpierron.tools.Helper;
 import org.apache.log4j.Logger;
 import org.jdom.Element;

OpdsOutput/src/main/java/com/gmail/dpierron/calibre/opds/SeriesSubCatalog.java

@@ -10,7 +10,7 @@
 import com.gmail.dpierron.calibre.configuration.Icons;
 import com.gmail.dpierron.calibre.configuration.ConfigurationManager;
 import com.gmail.dpierron.calibre.datamodel.*;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
+import com.gmail.dpierron.tools.i18n.Localization;
 import com.gmail.dpierron.calibre.trook.TrookSpecificSearchDatabaseManager;
 import com.gmail.dpierron.tools.Helper;
 

OpdsOutput/src/main/java/com/gmail/dpierron/calibre/opds/SubCatalog.java

@@ -7,7 +7,7 @@
 import com.gmail.dpierron.calibre.configuration.ConfigurationHolder;
 import com.gmail.dpierron.calibre.configuration.ConfigurationManager;
 import com.gmail.dpierron.calibre.datamodel.*;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
+import com.gmail.dpierron.tools.i18n.Localization;
 import com.gmail.dpierron.tools.Helper;
 import org.apache.log4j.Logger;
 import org.jdom.Document;

OpdsOutput/src/main/java/com/gmail/dpierron/calibre/opds/Summarizer.java

@@ -5,7 +5,7 @@
 import com.gmail.dpierron.calibre.datamodel.Book;
 import com.gmail.dpierron.calibre.datamodel.Series;
 import com.gmail.dpierron.calibre.datamodel.Tag;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
+import com.gmail.dpierron.tools.i18n.Localization;
 import com.gmail.dpierron.tools.Composite;
 import com.gmail.dpierron.tools.TreeNode;
 

OpdsOutput/src/main/java/com/gmail/dpierron/calibre/opds/TagListSubCatalog.java

@@ -6,7 +6,7 @@
 import com.gmail.dpierron.calibre.datamodel.Book;
 import com.gmail.dpierron.calibre.datamodel.DataModel;
 import com.gmail.dpierron.calibre.datamodel.Tag;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
+import com.gmail.dpierron.tools.i18n.Localization;
 import com.gmail.dpierron.calibre.trook.TrookSpecificSearchDatabaseManager;
 import com.gmail.dpierron.tools.Helper;
 import org.apache.log4j.Logger;

OpdsOutput/src/main/java/com/gmail/dpierron/calibre/opds/TagTreeSubCatalog.java

@@ -8,7 +8,7 @@
 import com.gmail.dpierron.calibre.configuration.Icons;
 import com.gmail.dpierron.calibre.datamodel.Book;
 import com.gmail.dpierron.calibre.datamodel.Tag;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
+import com.gmail.dpierron.tools.i18n.Localization;
 import com.gmail.dpierron.calibre.trook.TrookSpecificSearchDatabaseManager;
 import com.gmail.dpierron.tools.Helper;
 import com.gmail.dpierron.tools.RootTreeNode;

OpdsOutput/src/main/java/com/gmail/dpierron/calibre/opds/TagsSubCatalog.java

@@ -9,7 +9,7 @@
 import com.gmail.dpierron.calibre.datamodel.Tag;
 import com.gmail.dpierron.calibre.datamodel.filter.FilterHelper;
 import com.gmail.dpierron.calibre.datamodel.filter.RemoveSelectedTagsFilter;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
+import com.gmail.dpierron.tools.i18n.Localization;
 import com.gmail.dpierron.tools.Helper;
 import org.apache.log4j.Logger;
 import org.jdom.Element;

OpdsOutput/src/main/java/com/gmail/dpierron/calibre/thumbnails/CreateThumbnail.java

@@ -1,7 +1,7 @@
 package com.gmail.dpierron.calibre.thumbnails;
 
 import com.gmail.dpierron.calibre.opds.CatalogManager;
-import com.gmail.dpierron.calibre.opds.i18n.Localization;
+import com.gmail.dpierron.tools.i18n.Localization;
 import org.apache.log4j.Logger;
 
 import javax.imageio.ImageIO;

OpdsOutput/src/main/resources/Localization_de.properties

@@ -303,6 +303,9 @@ warn.badComment=Ungültiges XHTML im Kommentarfeld des Buchs (ID: {0}) {1}
 
 # HTML catalogs
 #**************
+# words to be treated as noise words in title and series
+# Note:  Any traling characters (e.g. space) must also be included and word terminated with comma
+i18n.noiseWords=deu, der , die , das , ein , eine ,
 # word used to separate items of a list.  E.g. "author1 and author2".  
 i18n.and=und
 i18n.downloads=Downloads, Links und andere Kataloge

OpdsOutput/src/main/resources/Localization_en.properties

@@ -303,6 +303,9 @@ warn.badComment=Invalid XHTML in the comment field for Book (Id={0}) {1}
 
 # HTML catalogs
 #**************
+# words to be treated as noise words in title and series
+# Note:  Any traling characters (e.g. space) must also be included and word terminated with comma
+i18n.noiseWords=eng, the , a , an ,
 # word used to separate items of a list.  E.g. "author1 and author2".  
 i18n.and=and
 i18n.downloads=Downloads, links and other catalogs