From patchwork Sun Aug 19 15:52:40 2007
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Udo Richter <udo_richter@gmx.de>
X-Patchwork-Id: 12508
Received: from mail.gmx.net ([213.165.64.20])
	by www.linuxtv.org with smtp (Exim 4.63)
	(envelope-from <udo_richter@gmx.de>) id 1IMnEr-0004HB-8w
	for vdr@linuxtv.org; Sun, 19 Aug 2007 18:02:53 +0200
Received: (qmail invoked by alias); 19 Aug 2007 16:02:22 -0000
Received: from W95da.w.pppool.de (EHLO localhost) [89.58.149.218]
	by mail.gmx.net (mp025) with SMTP; 19 Aug 2007 18:02:22 +0200
X-Authenticated: #1417946
X-Provags-ID: V01U2FsdGVkX1+Rqi1VRRGRanYVw8SMCQzcb0326U8Igi4BPGpr0U
	NtmJ0gGbCY/Bhq
Message-ID: <46C86748.3030103@gmx.de>
Date: Sun, 19 Aug 2007 17:52:40 +0200
From: Udo Richter <udo_richter@gmx.de>
User-Agent: Thunderbird 2.0.0.6 (Windows/20070728)
MIME-Version: 1.0
To: VDR Mailing List <vdr@linuxtv.org>
References: <46C8577B.6060008@cadsoft.de>
In-Reply-To: <46C8577B.6060008@cadsoft.de>
X-Y-GMX-Trusted: 0
Subject: Re: [vdr] [ANNOUNCE] VDR developer version 1.5.8
X-BeenThere: vdr@linuxtv.org
X-Mailman-Version: 2.1.9
Precedence: list
Reply-To: VDR Mailing List <vdr@linuxtv.org>
List-Id: VDR Mailing List <vdr.linuxtv.org>
List-Unsubscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=unsubscribe>
List-Archive: <http://www.linuxtv.org/pipermail/vdr>
List-Post: <mailto:vdr@linuxtv.org>
List-Help: <mailto:vdr-request@linuxtv.org?subject=help>
List-Subscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Aug 2007 16:05:09 -0000
Status: O
X-Status: 
X-Keywords: 
X-UID: 13833

Klaus Schmidinger wrote:
> - When scanning the locale directory, VDR now explicitly looks for a file named
>   vdr.mo. Text files for plugins are now named "vdr-name.mo", when "name" is the
>   name of the plugin. The "newplugin" script has been changed accordingly, and
>   plugin authors should change their Makefiles, too.

Ouch, here we go again. Hopefully this is the last name change.

The attached patch handles this in a way that is compatible with 1.5.7 
and 1.5.8, and it should apply to most plugins that have been updated 
for 1.5.7 already, restoring i18n functionality for 1.5.8.


Cheers,

Udo

Index: Makefile
===================================================================
--- Makefile	(Revision 955)
+++ Makefile	(Arbeitskopie)
@@ -88,6 +88,10 @@
 I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
 I18Ndirs  = $(notdir $(foreach file, $(I18Npo), $(basename $(file))))
 I18Npot   = $(PODIR)/$(PLUGIN).pot
+I18Nvdrmo = vdr-$(PLUGIN).mo
+ifeq ($(strip $(APIVERSION)),1.5.7)
+  I18Nvdrmo = $(PLUGIN).mo
+endif
 
 %.mo: %.po
 	msgfmt -c -o $@ $<
@@ -102,7 +106,7 @@
 	@mkdir -p $(LOCALEDIR)
 	for i in $(I18Ndirs); do\
 	    mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\
-	    cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/$(PLUGIN).mo;\
+	    cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/$(I18Nvdrmo);\
 	    done
 
 ### Targets: