| 1 |
hd_brummy 12/10/31 18:44:08 |
| 2 |
|
| 3 |
Added: vdr-ffnetdev-0.1.2_gettext.diff |
| 4 |
Log: |
| 5 |
bump, eapi=4; vdr-plugin-2.eclass, converted to gettext, bug 439970 |
| 6 |
|
| 7 |
(Portage version: 2.1.11.9/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.2_gettext.diff |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.2_gettext.diff?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.2_gettext.diff?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: vdr-ffnetdev-0.1.2_gettext.diff |
| 16 |
=================================================================== |
| 17 |
converting to gettext |
| 18 |
https://bugs.gentoo.org/show_bug.cgi?id=439970 |
| 19 |
Signed-of-by: Joerg Bornkessel <hd_brummy@g.o> |
| 20 |
diff -Naur vdr-ffnetdev-0.1.2.orig/ffnetdev.c vdr-ffnetdev-0.1.2/ffnetdev.c |
| 21 |
--- vdr-ffnetdev-0.1.2.orig/ffnetdev.c 2012-10-31 18:32:09.000000000 +0100 |
| 22 |
+++ vdr-ffnetdev-0.1.2/ffnetdev.c 2012-10-31 18:34:05.000000000 +0100 |
| 23 |
@@ -10,7 +10,7 @@ |
| 24 |
|
| 25 |
#include <vdr/tools.h> |
| 26 |
|
| 27 |
-#include "i18n.h" |
| 28 |
+#include <vdr/i18n.h> |
| 29 |
#include "tsworker.h" |
| 30 |
#include "netosd.h" |
| 31 |
#include "ffnetdev.h" |
| 32 |
@@ -22,7 +22,7 @@ |
| 33 |
|
| 34 |
|
| 35 |
const char *cPluginFFNetDev::VERSION = "0.1.2"; |
| 36 |
-const char *cPluginFFNetDev::DESCRIPTION = "Full Featured Network Device for Streaming"; |
| 37 |
+const char *cPluginFFNetDev::DESCRIPTION = trNOOP("Full Featured Network Device for Streaming"); |
| 38 |
//const char *cOSDWorker::MAINMENUENTRY = "FFNetDev"; |
| 39 |
|
| 40 |
// --- cNetOSDProvider ----------------------------------------------- |
| 41 |
@@ -163,9 +163,6 @@ |
| 42 |
bool cPluginFFNetDev::Start(void) |
| 43 |
{ |
| 44 |
// Start any background activities the plugin shall perform. |
| 45 |
- RegisterI18n(Phrases); |
| 46 |
- |
| 47 |
- |
| 48 |
cOSDWorker::Init(OSDPort, this); |
| 49 |
cTSWorker::Init(m_StreamDevice, TSPort, this); |
| 50 |
cClientControl::Init(ControlPort, this); |
| 51 |
diff -Naur vdr-ffnetdev-0.1.2.orig/Makefile vdr-ffnetdev-0.1.2/Makefile |
| 52 |
--- vdr-ffnetdev-0.1.2.orig/Makefile 2012-10-31 18:32:09.000000000 +0100 |
| 53 |
+++ vdr-ffnetdev-0.1.2/Makefile 2012-10-31 18:37:10.000000000 +0100 |
| 54 |
@@ -50,9 +50,7 @@ |
| 55 |
|
| 56 |
### The object files (add further files here): |
| 57 |
|
| 58 |
-COMMONOBJS = i18n.o \ |
| 59 |
- \ |
| 60 |
- tools/source.o tools/select.o tools/socket.o tools/tools.o |
| 61 |
+COMMONOBJS = tools/source.o tools/select.o tools/socket.o tools/tools.o |
| 62 |
|
| 63 |
|
| 64 |
SERVEROBJS = $(PLUGIN).o \ |
| 65 |
@@ -95,9 +93,34 @@ |
| 66 |
|
| 67 |
-include $(DEPFILE) |
| 68 |
|
| 69 |
+### Internationalization (I18N): |
| 70 |
+ |
| 71 |
+PODIR = po |
| 72 |
+LOCALEDIR = $(VDRDIR)/locale |
| 73 |
+I18Npo = $(wildcard $(PODIR)/*.po) |
| 74 |
+I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file)))) |
| 75 |
+I18Ndirs = $(notdir $(foreach file, $(I18Npo), $(basename $(file)))) |
| 76 |
+I18Npot = $(PODIR)/$(PLUGIN).pot |
| 77 |
+ |
| 78 |
+%.mo: %.po |
| 79 |
+ msgfmt -c -o $@ $< |
| 80 |
+ |
| 81 |
+$(I18Npot): $(wildcard *.c) |
| 82 |
+ xgettext -C -cTRANSLATORS --no-wrap -F -k -ktr -ktrNOOP --msgid-bugs-address='<dev@××××××××××××.de>' -o $@ $(wildcard *.c) |
| 83 |
+ |
| 84 |
+$(I18Npo): $(I18Npot) |
| 85 |
+ msgmerge -U --no-wrap -F --backup=none -q $@ $< |
| 86 |
+ |
| 87 |
+i18n: $(I18Nmo) |
| 88 |
+ @mkdir -p $(LOCALEDIR) |
| 89 |
+ for i in $(I18Ndirs); do\ |
| 90 |
+ mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\ |
| 91 |
+ cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/vdr-$(PLUGIN).mo;\ |
| 92 |
+ done |
| 93 |
+ |
| 94 |
### Targets: |
| 95 |
|
| 96 |
-all: libvdr-$(PLUGIN).so |
| 97 |
+all: libvdr-$(PLUGIN).so i18n |
| 98 |
|
| 99 |
libvdr-$(PLUGIN).so: $(SERVEROBJS) $(COMMONOBJS) |
| 100 |
|
| 101 |
@@ -106,6 +129,7 @@ |
| 102 |
@cp $@ $(LIBDIR)/$@.$(APIVERSION) |
| 103 |
|
| 104 |
dist: clean |
| 105 |
+ @-rm -f $(PODIR)/*.mo $(PODIR)/*.pot |
| 106 |
@-rm -rf $(TMPDIR)/$(ARCHIVE) |
| 107 |
@mkdir $(TMPDIR)/$(ARCHIVE) |
| 108 |
@cp -a * $(TMPDIR)/$(ARCHIVE) |
| 109 |
diff -Naur vdr-ffnetdev-0.1.2.orig/po/de_DE.po vdr-ffnetdev-0.1.2/po/de_DE.po |
| 110 |
--- vdr-ffnetdev-0.1.2.orig/po/de_DE.po 1970-01-01 01:00:00.000000000 +0100 |
| 111 |
+++ vdr-ffnetdev-0.1.2/po/de_DE.po 2012-10-31 18:38:02.000000000 +0100 |
| 112 |
@@ -0,0 +1,30 @@ |
| 113 |
+# VDR plugin language source file. |
| 114 |
+# Copyright (C) 2007 Klaus Schmidinger <kls@×××××××.de> |
| 115 |
+# This file is distributed under the same license as the VDR package. |
| 116 |
+# Klaus Schmidinger <kls@×××××××.de>, 2000 |
| 117 |
+# Erich Seifert <dev@××××××××××××.de>, 2012 |
| 118 |
+# |
| 119 |
+msgid "" |
| 120 |
+msgstr "" |
| 121 |
+"Project-Id-Version: VDR 1.7.27\n" |
| 122 |
+"Report-Msgid-Bugs-To: dev@××××××××××××.de\n" |
| 123 |
+"POT-Creation-Date: 2012-10-30 14:31+0100\n" |
| 124 |
+"PO-Revision-Date: 2012-10-30 14:37+0100\n" |
| 125 |
+"Last-Translator: Klaus Schmidinger <kls@×××××××.de>\n" |
| 126 |
+"Language-Team: <vdr@×××××××.org>\n" |
| 127 |
+"Language: \n" |
| 128 |
+"MIME-Version: 1.0\n" |
| 129 |
+"Content-Type: text/plain; charset=ISO-8859-15\n" |
| 130 |
+"Content-Transfer-Encoding: 8bit\n" |
| 131 |
+ |
| 132 |
+#: ffnetdevsetup.c:18 |
| 133 |
+msgid "auto set as primary device" |
| 134 |
+msgstr "Automatisch als prim�res Ger�t festlegen" |
| 135 |
+ |
| 136 |
+#: ffnetdevsetup.c:18 |
| 137 |
+msgid "no" |
| 138 |
+msgstr "nein" |
| 139 |
+ |
| 140 |
+#: ffnetdevsetup.c:18 |
| 141 |
+msgid "yes" |
| 142 |
+msgstr "ja" |
Archives