From fbc011f2ecaa1f1b9d7d93d8e745b5f065ad14ec Mon Sep 17 00:00:00 2001 From: Martin Francis Date: Sat, 2 Mar 2019 00:22:54 -0500 Subject: [PATCH] 0.19.4: Fixed some mismatched references for signal types and tweak translations a bit --- src/Columns/Signals.php | 2 +- src/Repository/TypeRepository.php | 40 +++++++++++++++---------------- templates/i18n.html.twig | 5 ++-- translations/messages.de.xlf | 12 ++++++---- translations/messages.en.xlf | 12 ++++++---- translations/messages.es.xlf | 12 ++++++---- translations/messages.fr.xlf | 12 ++++++---- 7 files changed, 56 insertions(+), 39 deletions(-) diff --git a/src/Columns/Signals.php b/src/Columns/Signals.php index b0498628..8279644f 100644 --- a/src/Columns/Signals.php +++ b/src/Columns/Signals.php @@ -160,7 +160,7 @@ public function getColumns() 'admin' => false, 'arg' => '', 'field' => 'heardInHtml', - 'label' => 'Heard In
(Daytime highlighted)', + 'label' => 'Heard In
(Daytime Log)', 'order' => 'a', 'sort' => 's.heardIn', 'td_class' => '', diff --git a/src/Repository/TypeRepository.php b/src/Repository/TypeRepository.php index e8187bb8..73820a29 100755 --- a/src/Repository/TypeRepository.php +++ b/src/Repository/TypeRepository.php @@ -12,17 +12,13 @@ class TypeRepository 'label' => 'DGPS', 'order' => 0, 'refs' => [ + 'title' => 'Additional DGPS Station Info', 'links' => [ - [ - 'label' => 'NDB List PDF (by Frequency)', - 'url' => 'http://www.ndblist.info/dgnavinfo/datamodes/worldDGPSdatabase.pdf' - ], [ 'label' => 'USCG DGPS Site List', 'url' => 'http://www.navcen.uscg.gov/?pageName=dgpsSiteInfo&All' ] - ], - 'title' => 'Additional DGPS Station Info' + ] ], 'title' => 'DGPS Station' ], @@ -42,13 +38,21 @@ class TypeRepository 'label' => 'Ham', 'order' => 2, 'refs' => [ + 'title' => 'Additional Ham Beacon Info:', 'links' => [ [ - 'label' => 'William Hepburn\'s LF List', - 'url' => 'http://www.dxinfocentre.com/ndb.htm' + 'label' => 'LOWFERS', + 'url' => 'http://www.lwca.org/sitepage/part15' ], - ], - 'title' => 'Additional Ham Beacon Info:' + [ + 'label' => 'HF', + 'url' => 'http://www.keele.ac.uk/depts/por/28.htm' + ], + [ + 'label' => '50MHz', + 'url' => 'http://www.keele.ac.uk/depts/por/50.htm' + ], + ] ], 'title' => 'Amateur Radio Beacon' ], @@ -59,21 +63,17 @@ class TypeRepository 'label' => 'Navtex', 'order' => 3, 'refs' => [ + 'title' => 'Additional Navtex Station Info:', 'links' => [ [ - 'label' => 'LOWFERS', - 'url' => 'http://www.lwca.org/sitepage/part15' - ], - [ - 'label' => 'HF', - 'url' => 'http://www.keele.ac.uk/depts/por/28.htm' + 'label' => 'William Hepburn\'s LF List', + 'url' => 'http://www.dxinfocentre.com/navtex.htm' ], [ - 'label' => '50MHz', - 'url' => 'http://www.keele.ac.uk/depts/por/50.htm' - ], + 'label' => 'William Hepburn\'s HF List', + 'url' => 'http://www.dxinfocentre.com/maritimesafetyinfo.htm' + ] ], - 'title' => 'Additional Navtex Station Info:' ], 'title' => 'NavTex Station' ], diff --git a/templates/i18n.html.twig b/templates/i18n.html.twig index c97fd236..1df8e3ce 100644 --- a/templates/i18n.html.twig +++ b/templates/i18n.html.twig @@ -352,7 +352,7 @@ {% trans %}Notes about this signal{% endtrans %} {% trans %}Notes{% endtrans %} {% trans %}Places where this signal has been reported{% endtrans %} -{% trans %}Heard In
(Daytime highlighted){% endtrans %} +{% trans %}Heard In
(Daytime Log){% endtrans %} {% trans %}Number of times this signal has been logged{% endtrans %} {% trans %}Logs{% endtrans %} {% trans %}Date on which signal was first logged{% endtrans %} @@ -393,8 +393,9 @@ {% trans %}USCG DGPS Site List{% endtrans %} {% trans %}Additional Ham Beacon Info:{% endtrans %} {% trans %}William Hepburn's LF List{% endtrans %} +{% trans %}William Hepburn's HF List{% endtrans %} {% trans %}Additional Navtex Station Info:{% endtrans %} {% trans %}LOWFERS{% endtrans %} {% trans %}HF{% endtrans %} {% trans %}50MHz{% endtrans %} -{% trans %}Additional NDB Info:{% endtrans %} \ No newline at end of file +{% trans %}Additional NDB Info:{% endtrans %} diff --git a/translations/messages.de.xlf b/translations/messages.de.xlf index 8f4e5e2c..4c4a8b72 100644 --- a/translations/messages.de.xlf +++ b/translations/messages.de.xlf @@ -1633,10 +1633,6 @@ of %s listeners __of %s listeners - - Heard In<br />(Daytime <em>highlighted</em>) - (Daytime highlighted)]]> - Call / ID __Call / ID @@ -1709,6 +1705,14 @@ Additional NDB Info: __Additional NDB Info: + + William Hepburn's HF List + __William Hepburn's HF List + + + Heard In<br /><em>(Daytime Log)</em> + (Daytime Log)]]> + diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf index eb630d53..37cf281d 100644 --- a/translations/messages.en.xlf +++ b/translations/messages.en.xlf @@ -1633,10 +1633,6 @@ of %s listeners of %s listeners - - Heard In<br />(Daytime <em>highlighted</em>) - (Daytime highlighted)]]> - Call / ID Call / ID @@ -1709,6 +1705,14 @@ Additional NDB Info: Additional NDB Info: + + William Hepburn's HF List + William Hepburn's HF List + + + Heard In<br /><em>(Daytime Log)</em> + (Daytime Log)]]> + diff --git a/translations/messages.es.xlf b/translations/messages.es.xlf index 260bbfc2..8906c736 100644 --- a/translations/messages.es.xlf +++ b/translations/messages.es.xlf @@ -1633,10 +1633,6 @@ of %s listeners __of %s listeners - - Heard In<br />(Daytime <em>highlighted</em>) - (Daytime highlighted)]]> - Call / ID __Call / ID @@ -1709,6 +1705,14 @@ Additional NDB Info: __Additional NDB Info: + + William Hepburn's HF List + __William Hepburn's HF List + + + Heard In<br /><em>(Daytime Log)</em> + (Daytime Log)]]> + diff --git a/translations/messages.fr.xlf b/translations/messages.fr.xlf index 94971017..4c1e9736 100644 --- a/translations/messages.fr.xlf +++ b/translations/messages.fr.xlf @@ -1633,10 +1633,6 @@ of %s listeners __of %s listeners - - Heard In<br />(Daytime <em>highlighted</em>) - (Daytime highlighted)]]> - Call / ID __Call / ID @@ -1709,6 +1705,14 @@ Additional NDB Info: __Additional NDB Info: + + William Hepburn's HF List + __William Hepburn's HF List + + + Heard In<br /><em>(Daytime Log)</em> + (Daytime Log)]]> +