diff mbox

vdr-1.5.3 - issue with translations out of plugins

Message ID 1HyDNW-0kaPiq0@fwd34.aul.t-online.de
State New
Headers

Commit Message

Alexander Riedel June 12, 2007, 8:54 p.m. UTC 
  Hi,
please try both patches together.
I have also problems after ma first patch with softdevice translations,
but now with Christian's patch is OK.



-----Original Message-----
Date: Tue, 12 Jun 2007 20:35:29 +0200
Subject: Re: [vdr] vdr-1.5.3 - issue with translations out of plugins
From: "Joachim Wilke" 
To: "VDR Mailing List" 

2007/6/12, Christian Wieninger :
> I still had crashes even when using Alexanders patch.
> I think the fix should look like this (diff against plain 1.5.3):

Hi,

I'm sorry but neither the first nor the second patch do work here. I
still get an segfault when lcdproc tries to translate "Volume ".

Regards,
Joachim.

Comments

Matthias Becker June 13, 2007, 10:50 a.m. UTC | #1 
Hi everbody,

I also tried both patches together and this did also not fix the
problem with the
translation of "Volume " out of lcdproc-Plugin.

Regards,
Matthias

2007/6/12, alexander-riedel@t-online.de <alexander-riedel@t-online.de>:
> Hi,
> please try both patches together.
> I have also problems after ma first patch with softdevice translations,
> but now with Christian's patch is OK.
>
>
>
> -----Original Message-----
> Date: Tue, 12 Jun 2007 20:35:29 +0200
> Subject: Re: [vdr] vdr-1.5.3 - issue with translations out of plugins
> From: "Joachim Wilke"
> To: "VDR Mailing List"
>
> 2007/6/12, Christian Wieninger :
> > I still had crashes even when using Alexanders patch.
> > I think the fix should look like this (diff against plain 1.5.3):
>
> Hi,
>
> I'm sorry but neither the first nor the second patch do work here. I
> still get an segfault when lcdproc tries to translate "Volume ".
>
> Regards,
> Joachim.
>
> _______________________________________________
> vdr mailing list
> vdr@linuxtv.org
> http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr
>
> _______________________________________________
> vdr mailing list
> vdr@linuxtv.org
> http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr
>
>
>
diff mbox

Patch

--- /home/riedel/GENS/orig-vdr/vdr-1.5.3.orig/i18n.c	2007-06-09 10:44:54.000000000 +0200
+++ /home/riedel/GENS/orig-vdr/vdr-1.5.3/i18n.c	2007-06-12 22:47:38.000000000 +0200
@@ -6820,7 +6820,7 @@ 
      *Converted = new tI18nPhrase[NumPhrases + 1];
      memset(*Converted, 0, sizeof(tI18nPhrase) * (NumPhrases + 1));
      }
-  if (!(*Converted)[NrPhrase][NrLanguage]) {
+  if (!(*Converted)[NrPhrase][NrLanguage] && Original[NrPhrase][NrLanguage]) {
      cCharSetConv csc(Phrases[1][NrLanguage], cCharSetConv::SystemCharacterTable());
      (*Converted)[NrPhrase][NrLanguage] = strdup(csc.Convert(Original[NrPhrase][NrLanguage]));
      }
@@ -6851,7 +6851,7 @@ 
                    return t;
                 }
              }
-         p = Phrases;
+         p = OriginalPhrases = Phrases;
          }
      esyslog("%s%sno translation found for '%s' in language %d (%s)", Plugin ? Plugin : "", Plugin ? ": " : "", s, Setup.OSDLanguage, Phrases[0][Setup.OSDLanguage]);
      }