Skip to content

Commit

Permalink
links should work even if markdown is disabled
Browse files Browse the repository at this point in the history
  • Loading branch information
@hartenthaler
hartenthaler committed Feb 19, 2021
1 parent cccd225 commit ad24867
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 27 deletions.
3 changes: 3 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,7 @@ Tested with 2.0 version.
## Usage
Activate this module as an admin (in Control Panel/Modules/Individual page/Historic events).

For wikipedia links in the notes markdown formatting is used; this should be enabled for your tree. See Control panel / Manage family trees / Preferences and then scroll down to "Text" and mark the option "markdown".
If markdown is disabled the links are still working, but the formatting isn't so nice.

Select as user "Historic events" at the "Facts and events" tab.
2 changes: 1 addition & 1 deletion latest-version.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.5.0
2.0.5.1
48 changes: 25 additions & 23 deletions module.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

public const CUSTOM_WEBSITE = 'https://github.com/hartenthaler/german-chancellors-presidents/';

public const CUSTOM_VERSION = '2.0.5.0';
public const CUSTOM_VERSION = '2.0.5.1';

public const CUSTOM_LAST = 'https://github.com/hartenthaler/german-chancellors-presidents/blob/master/latest-version.txt';

Expand Down Expand Up @@ -171,15 +171,17 @@ public function customTranslations(string $language): array
}

/**
* All events provided by this module.
* Structure of events provided by this module:
*
* Each line is a GEDCOM style record to describe an event (EVEN), including newline chars (\n);
* 1 EVEN <name> (<party>)
* 2 TYPE <Chancellor|President> of Germany
* 2 DATE <date period>
* 2 NOTE [wikipedia de](<link>)
*
* markdown is used for NOTE; markdown should be enabled for your tree (see Control panel / Manage family trees / Preferences and then scroll down to "Text" and mark the option "markdown")
* markdown is used for NOTE;
* markdown should be enabled for your tree (see Control panel / Manage family trees / Preferences and then scroll down to "Text" and mark the option "markdown");
* is markdown is disabled the links are still working (blank at the end is necessary), but the formatting isn't so nice;
*/

public function historicEventsAll(): Collection
Expand All @@ -195,28 +197,28 @@ public function historicEventsAll(): Collection

return new Collection([
// Chancellors:
"1 EVEN Konrad Adenauer (CDU)\n2 TYPE ".$eventTypeC."\n2 DATE FROM 15 SEP 1949 TO 16 OCT 1963\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Konrad_Adenauer)",
"1 EVEN Ludwig Erhard (CDU?)\n2 TYPE ".$eventTypeC."\n2 DATE FROM 16 OCT 1963 TO 1 DEC 1966\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Ludwig_Erhard)",
"1 EVEN Kurt Georg Kiesinger (CDU)\n2 TYPE ".$eventTypeC."\n2 DATE FROM 1 DEC 1966 TO 21 OCT 1969\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Kurt_Georg_Kiesinger)",
"1 EVEN Willy Brandt (SPD)\n2 TYPE ".$eventTypeC."\n2 DATE FROM 21 OCT 1969 TO 7 MAY 1974\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Willy_Brandt)",
"1 EVEN Walter Scheel (FDP)\n2 TYPE ".$eventTypeC." (".$eventSubtypeA.")\n2 DATE FROM 7 MAY 1974 TO 16 MAY 1974\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Walter_Scheel)",
"1 EVEN Helmut Schmidt (SPD)\n2 TYPE ".$eventTypeC."\n2 DATE FROM 16 MAY 1974 TO 1 OCT 1982\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Helmut_Schmidt)",
"1 EVEN Helmut Kohl (CDU)\n2 TYPE ".$eventTypeC."\n2 DATE FROM 1 OCT 1982 TO 27 OCT 1998\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Helmut_Kohl)",
"1 EVEN Gerhard Schröder (SPD)\n2 TYPE ".$eventTypeC."\n2 DATE FROM 27 OCT 1998 TO 22 NOV 2005\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Gerhard_Schröder)",
"1 EVEN Angela Merkel (CDU)\n2 TYPE ".$eventTypeC."\n2 DATE FROM 22 NOV 2005\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Angela_Merkel)",
"1 EVEN Konrad Adenauer (CDU)\n2 TYPE ".$eventTypeC."\n2 DATE FROM 15 SEP 1949 TO 16 OCT 1963\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Konrad_Adenauer )",
"1 EVEN Ludwig Erhard (CDU?)\n2 TYPE ".$eventTypeC."\n2 DATE FROM 16 OCT 1963 TO 1 DEC 1966\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Ludwig_Erhard )",
"1 EVEN Kurt Georg Kiesinger (CDU)\n2 TYPE ".$eventTypeC."\n2 DATE FROM 1 DEC 1966 TO 21 OCT 1969\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Kurt_Georg_Kiesinger )",
"1 EVEN Willy Brandt (SPD)\n2 TYPE ".$eventTypeC."\n2 DATE FROM 21 OCT 1969 TO 7 MAY 1974\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Willy_Brandt )",
"1 EVEN Walter Scheel (FDP)\n2 TYPE ".$eventTypeC." (".$eventSubtypeA.")\n2 DATE FROM 7 MAY 1974 TO 16 MAY 1974\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Walter_Scheel )",
"1 EVEN Helmut Schmidt (SPD)\n2 TYPE ".$eventTypeC."\n2 DATE FROM 16 MAY 1974 TO 1 OCT 1982\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Helmut_Schmidt )",
"1 EVEN Helmut Kohl (CDU)\n2 TYPE ".$eventTypeC."\n2 DATE FROM 1 OCT 1982 TO 27 OCT 1998\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Helmut_Kohl )",
"1 EVEN Gerhard Schröder (SPD)\n2 TYPE ".$eventTypeC."\n2 DATE FROM 27 OCT 1998 TO 22 NOV 2005\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Gerhard_Schröder )",
"1 EVEN Angela Merkel (CDU)\n2 TYPE ".$eventTypeC."\n2 DATE FROM 22 NOV 2005\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Angela_Merkel )",
// Presidents (without acting presidents):
"1 EVEN Theodor Heuss (FDP)\n2 TYPE ".$eventTypeP."\n2 DATE FROM 12 SEP 1949 TO 12 SEP 1959\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Theodor_Heuss)",
"1 EVEN Heinrich Lübke (CDU)\n2 TYPE ".$eventTypeP."\n2 DATE FROM 13 SEP 1959 TO 30 JUN 1969\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Heinrich_Lübke)",
"1 EVEN Gustav Heinemann (SPD)\n2 TYPE ".$eventTypeP."\n2 DATE FROM 1 JUL 1969 TO 30 JUN 1974\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Gustav_Heinemann)",
"1 EVEN Theodor Heuss (FDP)\n2 TYPE ".$eventTypeP."\n2 DATE FROM 12 SEP 1949 TO 12 SEP 1959\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Theodor_Heuss )",
"1 EVEN Heinrich Lübke (CDU)\n2 TYPE ".$eventTypeP."\n2 DATE FROM 13 SEP 1959 TO 30 JUN 1969\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Heinrich_Lübke )",
"1 EVEN Gustav Heinemann (SPD)\n2 TYPE ".$eventTypeP."\n2 DATE FROM 1 JUL 1969 TO 30 JUN 1974\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Gustav_Heinemann )",
"1 EVEN Walter Scheel (FDP)\n2 TYPE ".$eventTypeP."\n2 DATE FROM 1 JUL 1974 TO 30 JUN 1979\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Walter_Scheel )",
"1 EVEN Karl Carstens (CDU)\n2 TYPE ".$eventTypeP."\n2 DATE FROM 1 JUL 1979 TO 30 JUN 1984\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Karl_Carstens)",
"1 EVEN Richard von Weizsäcker (CDU)\n2 TYPE ".$eventTypeP."\n2 DATE FROM 1 JUL 1984 TO 30 JUN 1994\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Richard_von_Weizsäcker)",
"1 EVEN Roman Herzog (CDU)\n2 TYPE ".$eventTypeP."\n2 DATE FROM 1 JUL 1994 TO 30 JUN 1999\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Roman_Herzog)",
"1 EVEN Johannes Rau (SPD)\n2 TYPE ".$eventTypeP."\n2 DATE FROM 1 JUL 1999 TO 30 JUN 2004\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Johannes_Rau)",
"1 EVEN Horst Köhler (CDU)\n2 TYPE ".$eventTypeP."\n2 DATE FROM 1 JUL 2004 TO 31 MAY 2010\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Horst_Köhler)",
"1 EVEN Christian Wulff (CDU)\n2 TYPE ".$eventTypeP."\n2 DATE FROM 30 JUN 2010 TO 17 FEB 2012\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Christian_Wulff)",
"1 EVEN Joachim Gauck (parteilos)\n2 TYPE ".$eventTypeP."\n2 DATE FROM 18 MAR 2012 TO 18 MAR 2017\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Joachim_Gauck)",
"1 EVEN Frank-Walter Steinmeier (SPD)\n2 TYPE ".$eventTypeP."\n2 DATE FROM 19 MAR 2017\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Frank-Walter_Steinmeier)",
"1 EVEN Karl Carstens (CDU)\n2 TYPE ".$eventTypeP."\n2 DATE FROM 1 JUL 1979 TO 30 JUN 1984\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Karl_Carstens )",
"1 EVEN Richard von Weizsäcker (CDU)\n2 TYPE ".$eventTypeP."\n2 DATE FROM 1 JUL 1984 TO 30 JUN 1994\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Richard_von_Weizsäcker )",
"1 EVEN Roman Herzog (CDU)\n2 TYPE ".$eventTypeP."\n2 DATE FROM 1 JUL 1994 TO 30 JUN 1999\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Roman_Herzog )",
"1 EVEN Johannes Rau (SPD)\n2 TYPE ".$eventTypeP."\n2 DATE FROM 1 JUL 1999 TO 30 JUN 2004\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Johannes_Rau )",
"1 EVEN Horst Köhler (CDU)\n2 TYPE ".$eventTypeP."\n2 DATE FROM 1 JUL 2004 TO 31 MAY 2010\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Horst_Köhler )",
"1 EVEN Christian Wulff (CDU)\n2 TYPE ".$eventTypeP."\n2 DATE FROM 30 JUN 2010 TO 17 FEB 2012\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Christian_Wulff )",
"1 EVEN Joachim Gauck (parteilos)\n2 TYPE ".$eventTypeP."\n2 DATE FROM 18 MAR 2012 TO 18 MAR 2017\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Joachim_Gauck )",
"1 EVEN Frank-Walter Steinmeier (SPD)\n2 TYPE ".$eventTypeP."\n2 DATE FROM 19 MAR 2017\n2 NOTE [wikipedia ".$wikipedia."](https://".$wikipedia.".wikipedia.org/wiki/Frank-Walter_Steinmeier )",
]);
}

Expand Down
6 changes: 3 additions & 3 deletions resources/language/de.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ msgstr ""
msgid "Historical facts (in German) - Cancellors and Presidents of Germany (since 1949)"
msgstr "Historische Fakten (in Deutsch) - Bundeskanzler und Bundespräsidenten der Bundesrepublik Deutschland (seit 1949)"

#: module.php:186
#: module.php:189
msgid "Chancellor of Germany"
msgstr "Bundeskanzler von Deutschland"

#: module.php:187
#: module.php:190
msgid "President of Germany"
msgstr "Bundespräsident von Deutschland"

#: module.php:188
#: module.php:191
msgid "acting"
msgstr "geschäftsführend"

0 comments on commit ad24867

Please sign in to comment.