Merge branch 'release-1.2'

For some asian countries there is the original name following after a
linebreak. This is not needed in overview, so cat it of.

Related Task: [https://fs.golderweb.de/index.php?do=details&task_id=118 FS#118]

.gitmodules

@@ -1,4 +1,3 @@
 [submodule "jogobot"]
-    path = jogobot
-    url = git@github.com:golderweb/wiki-jogobot-core.git
-    branch = test-v1
+	path = jogobot
+	url = ../jogobot

README.md

@@ -11,6 +11,14 @@ On [JogoBots wikipedia user page](https://de.wikipedia.org/wiki/Benutzer:JogoBot
 * [jogobot-core module](https://github.com/golderweb/wiki-jogobot-core) used as submodule
 * [Isoweek module](https://pypi.python.org/pypi/isoweek)
 
+## Versions
+* v1.2
+  - improved repo structure
+* v1.1
+  - Cut Titel and Interpret on first linebreak
+* v1.0
+  - first stable release
+
 ## Bugs
 [wiki-jogobot-charts on fs.golderweb.de (de)](https://fs.golderweb.de/proj20)
 
@@ -18,4 +26,4 @@ On [JogoBots wikipedia user page](https://de.wikipedia.org/wiki/Benutzer:JogoBot
 GPLv3+
 
 ## Author Information
-Copyright 2016 Jonathan Golder <jonathan@golderweb.de>
+Copyright 2017 Jonathan Golder <jonathan@golderweb.de>

charts.py

@@ -11,7 +11,7 @@
 #
 #  modified by:
 #
-#  Copyright 2016 Jonathan Golder <jonathan@golderweb.de>
+#  Copyright 2017 Jonathan Golder <jonathan@golderweb.de>
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by

countrylist.py

@@ -3,7 +3,7 @@
 #
 #  countrylist.py
 #
-#  Copyright 2016 Jonathan Golder <jonathan@golderweb.de>
+#  Copyright 2017 Jonathan Golder <jonathan@golderweb.de>
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -284,6 +284,9 @@ missing!" )
         if self.entry.has( "Titel" ):
             self._titel_raw = self.entry.get("Titel").value
 
+            # Only use part before possible "<br"
+            self.remove_lines(self._titel_raw)
+
             # Remove possible ref-tags
             for ref in self._titel_raw.ifilter_tags(matches="ref"):
                 self._titel_raw.remove( ref )
@@ -356,6 +359,9 @@ missing!" )
         if self.entry.has( "Interpret" ):
             self._interpret_raw = self.entry.get("Interpret").value
 
+            # Only use part before possible "<br"
+            self.remove_lines(self._interpret_raw)
+
             # Remove possible ref-tags
             for ref in self._interpret_raw.ifilter_tags(matches="ref"):
                 self._interpret_raw.remove( ref )
@@ -458,6 +464,25 @@ missing!" )
         else:
             return str(keywords[0])
 
+    def remove_lines(self, wikicode):
+        """
+        Removes linebreaks (<br>) and everything after them in given wikicode
+        """
+        # Catch wrong typed param
+        if not isinstance(wikicode, mwparser.wikicode.Wikicode):
+            raise TypeError(str(type(self)) + "._remove_lines() expects " +
+                            "parameter 'wikicode' of type " +
+                            "'mwparserfromhell.wikicode.Wikicode', " +
+                            str(type(wikicode)) + " was given!")
+
+        # Find first linebreak
+        br = next(wikicode.ifilter_tags(matches="br"), None)
+
+        # If there is one, get its position and slice nodes-list
+        if br:
+            brpos = wikicode.nodes.index(br)
+            wikicode.nodes = wikicode.nodes[0:brpos]
+
     def __str__( self ):
         """
         Returns str repression for Object

summarypage.py

@@ -3,7 +3,7 @@
 #
 #  summarypage.py
 #
-#  Copyright 2016 Jonathan Golder <jonathan@golderweb.de>
+#  Copyright 2017 Jonathan Golder <jonathan@golderweb.de>
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by