frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed stripping the context in I18nTranslate()

Browse Source
This commit is contained in:
Klaus Schmidinger 2007-08-24 12:56:57 +02:00
parent 0a2fe2b6e8
commit f075b1cea7
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -1870,6 +1870,7 @@ Christian Wieninger <cwieninger@gmx.de>
for reporting a problem with a format string in recording.c on 64bit systems for reporting a problem with a format string in recording.c on 64bit systems
for reporting a problem with the device selection in case of timer conflicts for reporting a problem with the device selection in case of timer conflicts
for a patch that fixed part of a crash in i18n character set conversion for a patch that fixed part of a crash in i18n character set conversion
for reporting a bug in stripping the context in I18nTranslate()
Thiemo Gehrke <tgehrke@reel-multimedia.com> Thiemo Gehrke <tgehrke@reel-multimedia.com>
for suggesting to add a setup option to turn off the automatic timeout of the for suggesting to add a setup option to turn off the automatic timeout of the

2
HISTORY
View File

@ -5385,3 +5385,5 @@ Video Disk Recorder Revision History
- Fixed handling locale directories with a large number of entries (thanks to - Fixed handling locale directories with a large number of entries (thanks to
Anssi Hannula). Anssi Hannula).
- Updated Turkish language texts (thanks to Oktay Yolgeçen). - Updated Turkish language texts (thanks to Oktay Yolgeçen).
- Fixed stripping the context in I18nTranslate() (reported by Christian
Wieninger).

8
i18n.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: i18n.c 1.313 2007/08/19 16:03:03 kls Exp $ * $Id: i18n.c 1.314 2007/08/24 12:53:53 kls Exp $
* *
* *
*/ */
@ -208,10 +208,10 @@ const char *I18nTranslate(const char *s, const char *Plugin)
t = dgettext(Plugin, s); t = dgettext(Plugin, s);
if (t == s) if (t == s)
t = gettext(s); t = gettext(s);
s = t; if (t != s)
return t;
} }
const char *p = strchr(s, '$'); return SkipContext(s);
return p ? p + 1 : s;
} }
const char *I18nLocale(int Language) const char *I18nLocale(int Language)