Skip to content

Commit bf68ae5

Browse files
ngarbezzangarbezza
committed
i18n support added, spanish translations
1 parent 42c3572 commit bf68ae5

File tree

6 files changed

+422
-35
lines changed

6 files changed

+422
-35
lines changed

‎Makefile.cfg

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ INSTALLDIR=/usr/local/games/jugglemaster/
77
FFMPEG_PREFIX=/home/chunky/extras/ffmpeg
88
#HAVE_FFMPEG=1
99

10+
# System locale directory
11+
LOCALEDIR=/usr/share/locale
1012

1113
# You shouldn't have to edit anything below this line
1214

‎src/aajm/Makefile

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
include ../../Makefile.cfg
22

3-
CXXFLAGS+=-Wall -fsigned-char `aalib-config --cflags` -I../jmlib
3+
CXXFLAGS+=-Wall -fsigned-char `aalib-config --cflags` -I../jmlib -DLOCALEDIR=\"$(LOCALEDIR)\"
44
CFLAGS+=-Wall -fsigned-char `aalib-config --cflags` -I../jmlib
55
LIBS+=`aalib-config --libs` -L../jmlib -ljm
66
BINARY=aajm
@@ -31,7 +31,10 @@ install:
3131
mkdir -p $(INSTALLDIR)/bin
3232
$(INSTALL) $(BINARY) $(INSTALLDIR)/bin
3333
$(INSTALL) aajm-remote $(INSTALLDIR)/bin
34+
mkdir -p $(LOCALEDIR)/es_AR/LC_MESSAGES
35+
$(INSTALL) locale/es_AR/LC_MESSAGES/aajm.mo $(LOCALEDIR)/es_AR/LC_MESSAGES/aajm.mo
3436

3537
clean:
3638
rm -f *.o core aajm aajm-remote
3739
$(MAKE) -C ../jmlib clean
40+
rm -f $(LOCALEDIR)/es_AR/LC_MESSAGES/aajm.mo

‎src/aajm/aajm.cpp

+41-34
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515

1616
#include "./aajm.h"
1717

18+
#include <libintl.h>
19+
#include <locale.h>
20+
1821
aa_context *context;
1922
aa_renderparams *params;
2023
JMLib* jmlib;
@@ -82,7 +85,7 @@ void draw_juggler(int show_loadavg, aa_context *c, JMLib *j) {
8285
aa_imgwidth(c), aa_imgheight(c));
8386

8487
aa_printf(c, 0, 0, AA_SPECIAL,
85-
"Site: %s Style: %s Balls: %i",
88+
gettext("Site: %s Style: %s Balls: %i"),
8689
j->getSite(), j->getStyle(), j->numBalls());
8790

8891
if(show_loadavg) {
@@ -92,7 +95,7 @@ void draw_juggler(int show_loadavg, aa_context *c, JMLib *j) {
9295
load.one, load.five, load.fifteen);
9396
}
9497
if(j->getStatus() == ST_PAUSE) {
95-
aa_puts(c, 1, 3, AA_SPECIAL, "Paused");
98+
aa_puts(c, 1, 3, AA_SPECIAL, gettext("Paused"));
9699
}
97100
aa_flush(c);
98101

@@ -270,7 +273,7 @@ void main_loop(int max_iterations, int delay,
270273
memset(newsite,0,JML_MAX_SITELEN);
271274
strncpy(newsite, jmlib->getSite(), JML_MAX_SITELEN);
272275
aa_puts(context, 1, 4, AA_SPECIAL,
273-
"Enter New SiteSwap...");
276+
gettext("Enter New SiteSwap..."));
274277
aa_edit(context, 1, 5, 20,
275278
newsite, JML_MAX_SITELEN);
276279
if(newsite[0]!=0) {
@@ -292,7 +295,7 @@ void main_loop(int max_iterations, int delay,
292295
} else if(c=='t' || c=='T') {
293296
/* Change Style */
294297
aa_puts(context, 3, 4, AA_SPECIAL,
295-
"Choose New Style...");
298+
gettext("Choose New Style..."));
296299
for (i=0;i<jmlib->numStyles();i++) {
297300
aa_printf(context, 3, 5+i, AA_SPECIAL,
298301
"%i: %s",i+1,possible_styles[i]);
@@ -311,31 +314,31 @@ void main_loop(int max_iterations, int delay,
311314
/* Help */
312315
int curr_height = 4;
313316
aa_puts(context, 3, curr_height, AA_SPECIAL,
314-
"Key Help");
317+
gettext("Key Help"));
315318
++curr_height;
316319
aa_puts(context, 3, ++curr_height, AA_SPECIAL,
317-
"h - This screen");
320+
gettext("h - This screen"));
318321
aa_puts(context, 3, ++curr_height, AA_SPECIAL,
319-
"s - Change Siteswap");
322+
gettext("s - Change Siteswap"));
320323
aa_puts(context, 3, ++curr_height, AA_SPECIAL,
321-
"r - Random Pattern");
324+
gettext("r - Random Pattern"));
322325
aa_puts(context, 3, ++curr_height, AA_SPECIAL,
323-
"t - Change Style");
326+
gettext("t - Change Style"));
324327
aa_puts(context, 3, ++curr_height, AA_SPECIAL,
325-
"l - Toggle Load Monitoring");
328+
gettext("l - Toggle Load Monitoring"));
326329
#ifdef HAVE_AVCODEC_H
327330
aa_puts(context, 3, ++curr_height, AA_SPECIAL,
328-
"m - Dump MPEG");
331+
gettext("m - Dump MPEG"));
329332
#endif
330333
aa_puts(context, 3, ++curr_height, AA_SPECIAL,
331-
"q - Quit");
334+
gettext("q - Quit"));
332335
aa_puts(context, 3, ++curr_height, AA_SPECIAL,
333-
"space - Pause");
336+
gettext("space - Pause"));
334337
aa_puts(context, 3, ++curr_height, AA_SPECIAL,
335-
"+, -, enter - Speed up, down, reset");
338+
gettext("+, -, enter - Speed up, down, reset"));
336339
++curr_height;
337340
aa_puts(context, 3, ++curr_height, AA_SPECIAL,
338-
"Press any key to remove this menu");
341+
gettext("Press any key to remove this menu"));
339342
aa_flush(context);
340343
aa_getkey(context, 1);
341344
} else if(c=='+' || c=='=' || c=='k') {
@@ -351,7 +354,7 @@ void main_loop(int max_iterations, int delay,
351354
char mpegname[20];
352355
memset(mpegname,0,20);
353356
aa_puts(context, 1, 4, AA_SPECIAL,
354-
"Enter MPEG Name...");
357+
gettext("Enter MPEG Name..."));
355358
aa_edit(context, 1, 5, 20,
356359
mpegname, JML_MAX_SITELEN);
357360
if(mpegname[0]!=0) {
@@ -500,6 +503,10 @@ int main(int argc, char **argv) {
500503
float randomizesitetime = 0;
501504
char *endptr;
502505

506+
setlocale(LC_ALL, "");
507+
bindtextdomain("aajm", LOCALEDIR);
508+
textdomain("aajm");
509+
503510
char options[] = "aljhip:n:d:m:t:s:T:S:";
504511
static struct option long_options[] =
505512
{
@@ -583,27 +590,27 @@ int main(int argc, char **argv) {
583590
}
584591

585592
if(aahelp_flag || help_flag) {
586-
printf("AAJM, An ASCII Art Juggling program\n");
587-
printf("Usage: %s [OPTIONS]\n",argv[0]);
593+
printf(gettext("AAJM, An ASCII Art Juggling program\n"));
594+
printf(gettext("Usage: %s [OPTIONS]\n"),argv[0]);
588595
}
589596
if(help_flag) {
590-
printf("Jugglemaster Options:\n");
591-
printf(" -s, --siteswap=XX show siteswap XX (3)\n");
592-
printf(" -t, --style=XX use style XX (\"Normal\")\n");
593-
printf(" -S, --rsiteswap=XX Randomize siteswap every XX seconds (%f)\n", DEFRANDOMSITETIME);
594-
printf(" -T, --rstyle=XX Randomize style every XX seconds (%f)\n", DEFRANDOMSTYLETIME);
595-
printf(" -d, --delay=XX delay XX ms between frames (%i)\n", (int)DEFSPEED/1000);
596-
printf(" -m, --maxiterations=XX do at most XX iterations\n");
597-
printf(" -j, --justoutput only output [don't init kb or mouse]\n");
598-
printf(" -i, --ipc enable IPC\n");
599-
printf(" -p, --port=XX use port XX for IPC (%i)\n",DEFPORT);
600-
printf(" -l, --loadavg change speed based on load average\n");
601-
printf(" -n, --normalload=XX a normal load average for your machine (%2.2f)\n",DEFLOAD);
602-
printf(" -h, --help get help [this screen]\n");
603-
printf(" -a, --aahelp get help on AA options\n\n");
597+
printf(gettext("Jugglemaster Options:\n"));
598+
printf(gettext(" -s, --siteswap=XX show siteswap XX (3)\n"));
599+
printf(gettext(" -t, --style=XX use style XX (\"Normal\")\n"));
600+
printf(gettext(" -S, --rsiteswap=XX Randomize siteswap every XX seconds (%f)\n"), DEFRANDOMSITETIME);
601+
printf(gettext(" -T, --rstyle=XX Randomize style every XX seconds (%f)\n"), DEFRANDOMSTYLETIME);
602+
printf(gettext(" -d, --delay=XX delay XX ms between frames (%i)\n"), (int)DEFSPEED/1000);
603+
printf(gettext(" -m, --maxiterations=XX do at most XX iterations\n"));
604+
printf(gettext(" -j, --justoutput only output [don't init kb or mouse]\n"));
605+
printf(gettext(" -i, --ipc enable IPC\n"));
606+
printf(gettext(" -p, --port=XX use port XX for IPC (%i)\n"),DEFPORT);
607+
printf(gettext(" -l, --loadavg change speed based on load average\n"));
608+
printf(gettext(" -n, --normalload=XX a normal load average for your machine (%2.2f)\n"),DEFLOAD);
609+
printf(gettext(" -h, --help get help [this screen]\n"));
610+
printf(gettext(" -a, --aahelp get help on AA options\n\n"));
604611
}
605612
if(aahelp_flag) {
606-
printf("AALib Options:\n%s\n\n",aa_help);
613+
printf(gettext("AALib Options:\n%s\n\n"),aa_help);
607614
}
608615
if(aahelp_flag || help_flag) {
609616
return 0;
@@ -612,7 +619,7 @@ int main(int argc, char **argv) {
612619

613620
context = aa_autoinit(&aa_defparams);
614621
if (context == NULL) {
615-
printf("Failed to initialize aalib\n");
622+
printf(gettext("Failed to initialize aalib\n"));
616623
exit(1);
617624
}
618625

‎src/aajm/locale/es_AR/LC_MESSAGES/aajm.mo

3.71 KB
Binary file not shown.

‎src/aajm/locale/es_AR/LC_MESSAGES/aajm.po

+192
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,192 @@
1+
# Spanish translations for PACKAGE package.
2+
# Copyright (C) 2011 THE PACKAGE'S COPYRIGHT HOLDER
3+
# This file is distributed under the same license as the PACKAGE package.
4+
# TPI <tpi@uplcdtlx-desktop>, 2011.
5+
#
6+
msgid ""
7+
msgstr ""
8+
"Project-Id-Version: aajm\n"
9+
"Report-Msgid-Bugs-To: \n"
10+
"POT-Creation-Date: 2011-11-10 06:54-0300\n"
11+
"PO-Revision-Date: 2011-11-10 07:21-0300\n"
12+
"Last-Translator: TPI\n"
13+
"Language-Team: Argentinian\n"
14+
"MIME-Version: 1.0\n"
15+
"Content-Type: text/plain; charset=ASCII\n"
16+
"Content-Transfer-Encoding: 8bit\n"
17+
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
18+
19+
#: aajm.cpp:600
20+
#, c-format
21+
msgid " -S, --rsiteswap=XX Randomize siteswap every XX seconds (%f)\n"
22+
msgstr ""
23+
" -S, --rsiteswap=XX Hacer aleatorio el siteswap cada XX segundos (%"
24+
"f)\n"
25+
26+
#: aajm.cpp:601
27+
#, c-format
28+
msgid " -T, --rstyle=XX Randomize style every XX seconds (%f)\n"
29+
msgstr ""
30+
" -T, --rstyle=XX Hacer aleatorio el estilo cada XX segundos (%"
31+
"f)\n"
32+
33+
#: aajm.cpp:610
34+
#, c-format
35+
msgid ""
36+
" -a, --aahelp get help on AA options\n"
37+
"\n"
38+
msgstr ""
39+
" -a, --aahelp obtener ayuda con las opciones de AA\n"
40+
"\n"
41+
42+
#: aajm.cpp:602
43+
#, c-format
44+
msgid " -d, --delay=XX delay XX ms between frames (%i)\n"
45+
msgstr " -d, --delay=XX demora de XX ms entre frames (%i)\n"
46+
47+
#: aajm.cpp:609
48+
#, c-format
49+
msgid " -h, --help get help [this screen]\n"
50+
msgstr " -h, --help mostrar la ayuda [esta pantalla]\n"
51+
52+
#: aajm.cpp:605
53+
#, c-format
54+
msgid " -i, --ipc enable IPC\n"
55+
msgstr " -i, --ipc habilitar IPC\n"
56+
57+
#: aajm.cpp:604
58+
#, c-format
59+
msgid " -j, --justoutput only output [don't init kb or mouse]\n"
60+
msgstr ""
61+
" -j, --justoutput slo la salida [no inicializa teclado o mouse]\n"
62+
63+
#: aajm.cpp:607
64+
#, c-format
65+
msgid " -l, --loadavg change speed based on load average\n"
66+
msgstr ""
67+
" -l, --loadavg cambiar la velocidad basada en la carga "
68+
"promedio\n"
69+
70+
#: aajm.cpp:603
71+
#, c-format
72+
msgid " -m, --maxiterations=XX do at most XX iterations\n"
73+
msgstr " -m, --maxiterations=XX realizar a lo sumo XX iteraciones\n"
74+
75+
#: aajm.cpp:608
76+
#, c-format
77+
msgid ""
78+
" -n, --normalload=XX a normal load average for your machine (%2.2f)\n"
79+
msgstr ""
80+
" -n, --normalload=XX una carga normal promedio para su computadora (%"
81+
"2.2f)\n"
82+
83+
#: aajm.cpp:606
84+
#, c-format
85+
msgid " -p, --port=XX use port XX for IPC (%i)\n"
86+
msgstr " -p, --port=XX usar el puerto XX para IPC (%i)\n"
87+
88+
#: aajm.cpp:598
89+
#, c-format
90+
msgid " -s, --siteswap=XX show siteswap XX (3)\n"
91+
msgstr " -s, --siteswap=XX mostrar el siteswap XX (3)\n"
92+
93+
#: aajm.cpp:599
94+
#, c-format
95+
msgid " -t, --style=XX use style XX (\"Normal\")\n"
96+
msgstr " -t, --style=XX usar el estilo XX (\"Normal\")\n"
97+
98+
#: aajm.cpp:338
99+
msgid "+, -, enter - Speed up, down, reset"
100+
msgstr "+, -, enter - Aumentar velocidad, disminuir velocidad, reinicializar"
101+
102+
#: aajm.cpp:593
103+
#, c-format
104+
msgid "AAJM, An ASCII Art Juggling program\n"
105+
msgstr "AAJM, Un programa para hacer malabares hecho en ASCII Art\n"
106+
107+
#: aajm.cpp:613
108+
#, c-format
109+
msgid ""
110+
"AALib Options:\n"
111+
"%s\n"
112+
"\n"
113+
msgstr ""
114+
"Opciones de AALib:\n"
115+
"%s\n"
116+
"\n"
117+
118+
#: aajm.cpp:298
119+
msgid "Choose New Style..."
120+
msgstr "Elegir nuevo estilo..."
121+
122+
#: aajm.cpp:357
123+
msgid "Enter MPEG Name..."
124+
msgstr "Escribir el nombre del MPEG"
125+
126+
#: aajm.cpp:276
127+
msgid "Enter New SiteSwap..."
128+
msgstr "Escribir el nuevo SiteSwap..."
129+
130+
#: aajm.cpp:622
131+
#, c-format
132+
msgid "Failed to initialize aalib\n"
133+
msgstr "La inicializacin de aalib fall\n"
134+
135+
#: aajm.cpp:597
136+
#, c-format
137+
msgid "Jugglemaster Options:\n"
138+
msgstr "Opciones de Jugglemaster:\n"
139+
140+
#: aajm.cpp:317
141+
msgid "Key Help"
142+
msgstr "Ayuda - Teclas"
143+
144+
#: aajm.cpp:98
145+
msgid "Paused"
146+
msgstr "En pausa"
147+
148+
#: aajm.cpp:341
149+
msgid "Press any key to remove this menu"
150+
msgstr "Presione cualquier tecla para cerrar este men"
151+
152+
#: aajm.cpp:88
153+
#, c-format
154+
msgid "Site: %s Style: %s Balls: %i"
155+
msgstr "Sitio: %s Estilo: %s Pelotas: %i"
156+
157+
#: aajm.cpp:594
158+
#, c-format
159+
msgid "Usage: %s [OPTIONS]\n"
160+
msgstr "Uso: %s [OPTIONS]\n"
161+
162+
#: aajm.cpp:320
163+
msgid "h - This screen"
164+
msgstr "h - esta pantalla"
165+
166+
#: aajm.cpp:328
167+
msgid "l - Toggle Load Monitoring"
168+
msgstr "l - Activar/desactivar monitoreo de carga"
169+
170+
#: aajm.cpp:331
171+
msgid "m - Dump MPEG"
172+
msgstr "m - Exportar a MPEG"
173+
174+
#: aajm.cpp:334
175+
msgid "q - Quit"
176+
msgstr "q - Salir"
177+
178+
#: aajm.cpp:324
179+
msgid "r - Random Pattern"
180+
msgstr "r - Patrn aleatorio"
181+
182+
#: aajm.cpp:322
183+
msgid "s - Change Siteswap"
184+
msgstr "s - Cambiar Siteswap"
185+
186+
#: aajm.cpp:336
187+
msgid "space - Pause"
188+
msgstr "space - Pausa"
189+
190+
#: aajm.cpp:326
191+
msgid "t - Change Style"
192+
msgstr "t - Cambiar estilo"

0 commit comments

Comments
 (0)