From: Reimar Döffinger <rdoeffinger@users.noreply.github.com>
Date: Sun, 20 Dec 2020 09:55:20 +0000 (+0100)
Subject: Merge pull request #3 from zorun/swedish
X-Git-Url: http://gitweb.fperrin.net/?p=DictionaryPC.git;a=commitdiff_plain;h=96e85ff86f44888a9994710d55e760893d87da76;hp=-c

Merge pull request #3 from zorun/swedish

Add french-swedish dictionary support.
---

96e85ff86f44888a9994710d55e760893d87da76
diff --combined src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java
index 01b31a2,86206a0..fb9f283
--- a/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java
+++ b/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java
@@@ -14,13 -14,17 +14,13 @@@
  
  package com.hughes.android.dictionary.parser.wiktionary;
  
 -import com.hughes.android.dictionary.engine.Language;
 -
  import java.util.LinkedHashMap;
 -import java.util.LinkedHashSet;
  import java.util.Map;
 -import java.util.Set;
  import java.util.regex.Pattern;
  
  public class WiktionaryLangs {
  
 -    public static final Map<String,String> isoCodeToEnWikiName = new LinkedHashMap<String,String>();
 +    public static final Map<String,String> isoCodeToEnWikiName = new LinkedHashMap<>();
      static {
          isoCodeToEnWikiName.put("AF", "Afrikaans");
          isoCodeToEnWikiName.put("SQ", "Albanian");
@@@ -107,6 -111,7 +107,6 @@@
          isoCodeToEnWikiName.put("HT", "Haitian Creole");
          isoCodeToEnWikiName.put("LB", "Luxembourgish");
          isoCodeToEnWikiName.put("MK", "Macedonian");
 -        isoCodeToEnWikiName.put("GV", "Manx");
          isoCodeToEnWikiName.put("scn", "Sicilian");
          isoCodeToEnWikiName.put("cu", "Old Church Slavonic");
          isoCodeToEnWikiName.put("rom", "Romani");
@@@ -128,7 -133,7 +128,7 @@@
          //assert Language.isoCodeToResources.keySet().containsAll(isoCodeToEnWikiName.keySet());
      }
  
 -    public static final Map<String,Map<String,String>> wikiCodeToIsoCodeToWikiName = new LinkedHashMap<String, Map<String,String>>();
 +    public static final Map<String,Map<String,String>> wikiCodeToIsoCodeToWikiName = new LinkedHashMap<>();
      static {
          Map<String,String> isoCodeToWikiName;
  
@@@ -136,7 -141,7 +136,7 @@@
          wikiCodeToIsoCodeToWikiName.put("en", isoCodeToEnWikiName);
  
          // egrep -o '\{\{Wortart[^}]+\}\}' dewiktionary-pages-articles.xml | cut -d \| -f3 | sort | uniq -c | sort -nr
 -        isoCodeToWikiName = new LinkedHashMap<String, String>();
 +        isoCodeToWikiName = new LinkedHashMap<>();
          wikiCodeToIsoCodeToWikiName.put("de", isoCodeToWikiName);
          isoCodeToWikiName.put("nds", "Niederdeutsch");
          isoCodeToWikiName.put("DE", "Deutsch");
@@@ -154,7 -159,7 +154,7 @@@
          isoCodeToWikiName.put("RO", "Rumänisch");
  
          // egrep -o '== *\{\{langue\|[a-zA-Z]+\}\} *==' frwiktionary-pages-articles.xml | sort | uniq -c | sort -nr
 -        isoCodeToWikiName = new LinkedHashMap<String, String>();
 +        isoCodeToWikiName = new LinkedHashMap<>();
          wikiCodeToIsoCodeToWikiName.put("fr", isoCodeToWikiName);
          isoCodeToWikiName.put("FR", Pattern.quote("{{langue|fr}}"));
          isoCodeToWikiName.put("RU", Pattern.quote("{{langue|ru}}"));
@@@ -179,9 -184,10 +179,10 @@@
          isoCodeToWikiName.put("ES", Pattern.quote("{{langue|es}}"));
          isoCodeToWikiName.put("UK", Pattern.quote("{{langue|uk}}"));
          isoCodeToWikiName.put("PT", Pattern.quote("{{langue|pt}}"));
+         isoCodeToWikiName.put("SV", Pattern.quote("{{langue|sv}}"));
  
          // egrep -o '= *\{\{-[a-z]+-\}\} *=' itwiktionary-pages-articles.xml | sort | uniq -c | sort -n
 -        isoCodeToWikiName = new LinkedHashMap<String, String>();
 +        isoCodeToWikiName = new LinkedHashMap<>();
          wikiCodeToIsoCodeToWikiName.put("it", isoCodeToWikiName);
          isoCodeToWikiName.put("IT", "\\{\\{-(it|scn|nap|cal|lmo)-\\}\\}");  // scn, nap, cal, lmo
          isoCodeToWikiName.put("EN", Pattern.quote("{{-en-}}"));
@@@ -199,7 -205,7 +200,7 @@@
          isoCodeToWikiName.put("RU", Pattern.quote("{{-ru-}}"));
  
          // egrep -o '== *\{\{lengua\|[a-zA-Z]+\}\} *==' frwiktionary-pages-articles.xml | sort | uniq -c | sort -nr
 -        isoCodeToWikiName = new LinkedHashMap<String, String>();
 +        isoCodeToWikiName = new LinkedHashMap<>();
          wikiCodeToIsoCodeToWikiName.put("es", isoCodeToWikiName);
          isoCodeToWikiName.put("AR", Pattern.quote("{{lengua|ar}}"));
          isoCodeToWikiName.put("ES", Pattern.quote("{{lengua|es}}"));
@@@ -208,7 -214,7 +209,7 @@@
          isoCodeToWikiName.put("IT", Pattern.quote("{{lengua|it}}"));
  
          // Pattern seems to match Italian one
 -        isoCodeToWikiName = new LinkedHashMap<String, String>();
 +        isoCodeToWikiName = new LinkedHashMap<>();
          wikiCodeToIsoCodeToWikiName.put("pt", isoCodeToWikiName);
          isoCodeToWikiName.put("PT", Pattern.quote("{{-pt-}}"));
          isoCodeToWikiName.put("EN", Pattern.quote("{{-en-}}"));