From a5f3edc89393f869bfc6cbcadff5b727562df88a Mon Sep 17 00:00:00 2001 From: Dieter Hametner Date: Sat, 19 Jun 2010 02:03:19 +0200 Subject: Added translators hint and a german locale for the date/time formating of recordings provided by Dominic Evans. --- i18n-generated.h | 35 +++++++++++++++++++++++++++++++++++ pages/recordings.ecpp | 9 +++++++-- po/ca_ES.po | 6 ++++++ po/cs_CZ.po | 6 ++++++ po/da_DK.po | 6 ++++++ po/de_DE.po | 10 ++++++++++ po/el_GR.po | 6 ++++++ po/es_ES.po | 6 ++++++ po/et_EE.po | 6 ++++++ po/fi_FI.po | 6 ++++++ po/fr_FR.po | 6 ++++++ po/hr_HR.po | 6 ++++++ po/hu_HU.po | 6 ++++++ po/it_IT.po | 12 +++++++++++- po/lt_LT.po | 6 ++++++ po/nl_NL.po | 6 ++++++ po/nn_NO.po | 6 ++++++ po/pl_PL.po | 6 ++++++ po/pt_PT.po | 6 ++++++ po/ro_RO.po | 6 ++++++ po/ru_RU.po | 6 ++++++ po/sl_SI.po | 6 ++++++ po/sv_SE.po | 6 ++++++ po/tr_TR.po | 6 ++++++ tools.cpp | 4 ++-- 25 files changed, 185 insertions(+), 5 deletions(-) diff --git a/i18n-generated.h b/i18n-generated.h index 8df9698..f88df67 100644 --- a/i18n-generated.h +++ b/i18n-generated.h @@ -7497,6 +7497,41 @@ const tI18nPhrase Phrases[] = { #if VDRVERSNUM >= 10342 "", #endif +#if VDRVERSNUM >= 10502 + "", +#endif + }, + { "%a %x %X", + "%a, %d.%m.%Y %H:%M", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", +#if VDRVERSNUM >= 10302 + "", +#endif +#if VDRVERSNUM >= 10307 + "", +#endif +#if VDRVERSNUM >= 10313 + "", +#endif +#if VDRVERSNUM >= 10316 + "", +#endif +#if VDRVERSNUM >= 10342 + "", +#endif #if VDRVERSNUM >= 10502 "", #endif diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp index 060c847..7b57c11 100644 --- a/pages/recordings.ecpp +++ b/pages/recordings.ecpp @@ -220,10 +220,15 @@ for (iter = recordingsTree->begin(path); iter != end; ++iter) { string shortDescr; string archived; +<%cpp> + // TRANSLATORS: strftime format string for recording start info: day, date, hour. + // xgettext:no-c-format + char const * recFormatStr( tr("%a %x %X") ); +
<%cpp> reply.out() << StringRepeat(level + 1, "\"\""); <%cpp> if (!archived.empty()) { " alt="on_dvd" <& tooltip.hint text=(archived) &> /><%cpp> } else { " alt="movie" /><%cpp> }
-
<$ FormatDateTime(tr("%a %x %X"), startTime) $>
+
<$ FormatDateTime(recFormatStr, startTime) $>
(<$ duration $>)
<& tooltip.display domId=(id) &>><$ name $>
<%cpp>if ((name != shortDescr) && (!shortDescr.empty())) {<$ shortDescr $><%cpp> } else {  <%cpp> }
@@ -233,7 +238,7 @@ for (iter = recordingsTree->begin(path); iter != end; ++iter) { <& recordings.rec_tools id=(id) title=(name)&> <%cpp> - } + } else { diff --git a/po/ca_ES.po b/po/ca_ES.po index 2f0b0e2..14da8f5 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -12,6 +12,7 @@ msgstr "" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Jordi Vilà \n" "Language-Team: see developers in README\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" @@ -660,6 +661,11 @@ msgstr "" msgid "play this recording." msgstr "" +#. TRANSLATORS: strftime format string for recording start info: day, date, hour. +#, no-c-format +msgid "%a %x %X" +msgstr "" + msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index 1671f19..cfcd240 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Vladimír Bárta \n" "Language-Team: see developers in README\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" @@ -658,6 +659,11 @@ msgstr "" msgid "play this recording." msgstr "" +#. TRANSLATORS: strftime format string for recording start info: day, date, hour. +#, no-c-format +msgid "%a %x %X" +msgstr "" + msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" diff --git a/po/da_DK.po b/po/da_DK.po index c82a784..068bcff 100644 --- a/po/da_DK.po +++ b/po/da_DK.po @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Mogens Elneff \n" "Language-Team: see developers in README\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" @@ -658,6 +659,11 @@ msgstr "" msgid "play this recording." msgstr "" +#. TRANSLATORS: strftime format string for recording start info: day, date, hour. +#, no-c-format +msgid "%a %x %X" +msgstr "" + msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" diff --git a/po/de_DE.po b/po/de_DE.po index 6a890f9..e5f740c 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -12,6 +12,7 @@ msgstr "" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Dieter Hametner \n" "Language-Team: see developers in README\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" @@ -660,6 +661,11 @@ msgstr "Diese Aufnahme von der Festplatte l msgid "play this recording." msgstr "Diese Aufnahme abspielen." +#. TRANSLATORS: strftime format string for recording start info: day, date, hour. +#, no-c-format +msgid "%a %x %X" +msgstr "%a, %d.%m.%Y %H:%M" + msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "Konnte Kanal nicht finden oder keine Kanäle verfügbar. Ist die Anfrage korrekt?" @@ -865,6 +871,10 @@ msgstr "" msgid "No EPG information available" msgstr "Keine EPG Daten vorhanden" +#, fuzzy +#~ msgid "GGGGGGGGGG" +#~ msgstr "%a, %d.%m.%Y %H:%M Uhr" + #, fuzzy #~ msgid "Please set a name and password for the user!" #~ msgstr "Bitte Login und Passwort angeben!" diff --git a/po/el_GR.po b/po/el_GR.po index 12022ed..7c9125d 100644 --- a/po/el_GR.po +++ b/po/el_GR.po @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Dimitrios Dimitrakos \n" "Language-Team: see developers in README\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-7\n" "Content-Transfer-Encoding: 8bit\n" @@ -658,6 +659,11 @@ msgstr "" msgid "play this recording." msgstr "" +#. TRANSLATORS: strftime format string for recording start info: day, date, hour. +#, no-c-format +msgid "%a %x %X" +msgstr "" + msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index 3fb7d03..4340adc 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Ruben Nunez Francisco \n" "Language-Team: see developers in README\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" @@ -658,6 +659,11 @@ msgstr "" msgid "play this recording." msgstr "" +#. TRANSLATORS: strftime format string for recording start info: day, date, hour. +#, no-c-format +msgid "%a %x %X" +msgstr "" + msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" diff --git a/po/et_EE.po b/po/et_EE.po index 080f4f5..95032ba 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Arthur Konovalov \n" "Language-Team: see developers in README\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-13\n" "Content-Transfer-Encoding: 8bit\n" @@ -658,6 +659,11 @@ msgstr "" msgid "play this recording." msgstr "" +#. TRANSLATORS: strftime format string for recording start info: day, date, hour. +#, no-c-format +msgid "%a %x %X" +msgstr "" + msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" diff --git a/po/fi_FI.po b/po/fi_FI.po index 5e4979b..df0ea12 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Rolf Ahrenberg \n" "Language-Team: see developers in README\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -659,6 +660,11 @@ msgstr "Poista tallenne kovalevyltä!" msgid "play this recording." msgstr "Toista tallenne" +#. TRANSLATORS: strftime format string for recording start info: day, date, hour. +#, no-c-format +msgid "%a %x %X" +msgstr "" + msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "Kanavaa ei löydy. Kirjoititko varmasti oikein?" diff --git a/po/fr_FR.po b/po/fr_FR.po index 5b35f8f..cde3725 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -13,6 +13,7 @@ msgstr "" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Nicolas Huillard \n" "Language-Team: see developers in README\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" @@ -679,6 +680,11 @@ msgstr "" msgid "play this recording." msgstr "lire cette enregistrement." +#. TRANSLATORS: strftime format string for recording start info: day, date, hour. +#, no-c-format +msgid "%a %x %X" +msgstr "" + msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "N'a pas pu trouver la chaîne. Votre requête est t'elle corrête? " diff --git a/po/hr_HR.po b/po/hr_HR.po index 1a9c76c..b62495a 100644 --- a/po/hr_HR.po +++ b/po/hr_HR.po @@ -11,6 +11,7 @@ msgstr "" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Drazen Dupor \n" "Language-Team: see developers in README\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" @@ -659,6 +660,11 @@ msgstr "" msgid "play this recording." msgstr "" +#. TRANSLATORS: strftime format string for recording start info: day, date, hour. +#, no-c-format +msgid "%a %x %X" +msgstr "" + msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" diff --git a/po/hu_HU.po b/po/hu_HU.po index 9994b70..e9d197d 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -11,6 +11,7 @@ msgstr "" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Istvan Koenigsberger , Guido Josten \n" "Language-Team: see developers in README\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" @@ -659,6 +660,11 @@ msgstr "" msgid "play this recording." msgstr "" +#. TRANSLATORS: strftime format string for recording start info: day, date, hour. +#, no-c-format +msgid "%a %x %X" +msgstr "" + msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" diff --git a/po/it_IT.po b/po/it_IT.po index 097b69d..bad402e 100755 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -13,6 +13,7 @@ msgstr "" "PO-Revision-Date: 2010-02-22 00:19+0100\n" "Last-Translator: Diego Pierotto \n" "Language-Team: see developers in README\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -664,6 +665,11 @@ msgstr "Elimina questa registrazione dal disco fisso!" msgid "play this recording." msgstr "Riproduci questa registrazione" +#. TRANSLATORS: strftime format string for recording start info: day, date, hour. +#, no-c-format +msgid "%a %x %X" +msgstr "" + msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "Impossibile trovare canale o canali disponibili. Hai digitato correttamente la richiesta?" @@ -872,14 +878,19 @@ msgstr "Nessuna informazione EPG disponibile" #, fuzzy #~ msgid "Please set a name and password for the user!" #~ msgstr "Digita un nome utente e password!" + #~ msgid "Interval" #~ msgstr "Intervallo" + #~ msgid "Show schedule of channel" #~ msgstr "Mostra scheda programmi canale" + #~ msgid "%a, %b %d" #~ msgstr "%a, %b %d" + #~ msgid "Stream into browser" #~ msgstr "Trasmetti nel browser" + #~ msgid "Edit this" #~ msgstr "Modifica timer" @@ -894,4 +905,3 @@ msgstr "Nessuna informazione EPG disponibile" #, fuzzy #~ msgid "%A, %B %d %Y" #~ msgstr "%A, %b %d %Y" - diff --git a/po/lt_LT.po b/po/lt_LT.po index 1f206f6..1d12e4a 100644 --- a/po/lt_LT.po +++ b/po/lt_LT.po @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Valdemaras Pipiras \n" "Language-Team: see developers in README\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -658,6 +659,11 @@ msgstr "IÅ¡trinti šį įraÅ¡Ä… iÅ¡ disko!" msgid "play this recording." msgstr "groti šį įraÅ¡Ä…." +#. TRANSLATORS: strftime format string for recording start info: day, date, hour. +#, no-c-format +msgid "%a %x %X" +msgstr "" + msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "Kanalas nerastas arba jo iÅ¡ vis nÄ—ra. Gal klaidingai įvedÄ—te paieÅ¡kos frazÄ™?" diff --git a/po/nl_NL.po b/po/nl_NL.po index 9dca46b..132d61f 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -12,6 +12,7 @@ msgstr "" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Maarten Wisse \n" "Language-Team: see developers in README\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" @@ -675,6 +676,11 @@ msgstr "" msgid "play this recording." msgstr "" +#. TRANSLATORS: strftime format string for recording start info: day, date, hour. +#, no-c-format +msgid "%a %x %X" +msgstr "" + msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" diff --git a/po/nn_NO.po b/po/nn_NO.po index df2d80b..2bb4618 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -11,6 +11,7 @@ msgstr "" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Truls Slevigen \n" "Language-Team: see developers in README\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" @@ -659,6 +660,11 @@ msgstr "" msgid "play this recording." msgstr "" +#. TRANSLATORS: strftime format string for recording start info: day, date, hour. +#, no-c-format +msgid "%a %x %X" +msgstr "" + msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" diff --git a/po/pl_PL.po b/po/pl_PL.po index 56203df..1a58555 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Michael Rakowski \n" "Language-Team: see developers in README\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" @@ -658,6 +659,11 @@ msgstr "" msgid "play this recording." msgstr "" +#. TRANSLATORS: strftime format string for recording start info: day, date, hour. +#, no-c-format +msgid "%a %x %X" +msgstr "" + msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" diff --git a/po/pt_PT.po b/po/pt_PT.po index 2f39d1f..fe4b4fd 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Paulo Lopes \n" "Language-Team: see developers in README\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" @@ -658,6 +659,11 @@ msgstr "" msgid "play this recording." msgstr "" +#. TRANSLATORS: strftime format string for recording start info: day, date, hour. +#, no-c-format +msgid "%a %x %X" +msgstr "" + msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" diff --git a/po/ro_RO.po b/po/ro_RO.po index 8392c82..25ac87c 100644 --- a/po/ro_RO.po +++ b/po/ro_RO.po @@ -11,6 +11,7 @@ msgstr "" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Lucian Muresan \n" "Language-Team: see developers in README\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" @@ -659,6 +660,11 @@ msgstr "" msgid "play this recording." msgstr "" +#. TRANSLATORS: strftime format string for recording start info: day, date, hour. +#, no-c-format +msgid "%a %x %X" +msgstr "" + msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" diff --git a/po/ru_RU.po b/po/ru_RU.po index 5431e2d..7eadac6 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Vyacheslav Dikonov \n" "Language-Team: see developers in README\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-5\n" "Content-Transfer-Encoding: 8bit\n" @@ -658,6 +659,11 @@ msgstr "" msgid "play this recording." msgstr "" +#. TRANSLATORS: strftime format string for recording start info: day, date, hour. +#, no-c-format +msgid "%a %x %X" +msgstr "" + msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" diff --git a/po/sl_SI.po b/po/sl_SI.po index 532c142..8fbd1cc 100644 --- a/po/sl_SI.po +++ b/po/sl_SI.po @@ -11,6 +11,7 @@ msgstr "" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Matjaz Thaler \n" "Language-Team: see developers in README\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" @@ -659,6 +660,11 @@ msgstr "" msgid "play this recording." msgstr "" +#. TRANSLATORS: strftime format string for recording start info: day, date, hour. +#, no-c-format +msgid "%a %x %X" +msgstr "" + msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" diff --git a/po/sv_SE.po b/po/sv_SE.po index 9c3a6a6..da82edc 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -11,6 +11,7 @@ msgstr "" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Tomas Prybil \n" "Language-Team: see developers in README\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" @@ -659,6 +660,11 @@ msgstr "" msgid "play this recording." msgstr "" +#. TRANSLATORS: strftime format string for recording start info: day, date, hour. +#, no-c-format +msgid "%a %x %X" +msgstr "" + msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" diff --git a/po/tr_TR.po b/po/tr_TR.po index 221f204..f15678e 100644 --- a/po/tr_TR.po +++ b/po/tr_TR.po @@ -11,6 +11,7 @@ msgstr "" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Oktay Yolgeçen \n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-9\n" "Content-Transfer-Encoding: 8bit\n" @@ -659,6 +660,11 @@ msgstr "" msgid "play this recording." msgstr "" +#. TRANSLATORS: strftime format string for recording start info: day, date, hour. +#, no-c-format +msgid "%a %x %X" +msgstr "" + msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" diff --git a/tools.cpp b/tools.cpp index 8b6006e..bda91f0 100644 --- a/tools.cpp +++ b/tools.cpp @@ -19,7 +19,7 @@ istream& operator>>( istream& is, tChannelID& ret ) { /* alternativ implementation string line; - if ( !getline( is, line ) ) { + if ( !getline( is, line ) ) { if ( !is.eof() ) is.setstate( ios::badbit ); else @@ -42,7 +42,7 @@ istream& operator>>( istream& is, tChannelID& ret ) return is; } } - + if ( !line.empty() && !( ret = tChannelID::FromString( line.c_str() ) ).Valid() ) is.setstate( ios::badbit ); return is; -- cgit v1.2.3