wesnoth-cvs-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Wesnoth-cvs-commits] wesnoth/src about.cpp


From: Isaac Clerencia
Subject: [Wesnoth-cvs-commits] wesnoth/src about.cpp
Date: Tue, 31 Aug 2004 08:06:26 -0400

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Isaac Clerencia <address@hidden>        04/08/31 12:00:24

Modified files:
        src            : about.cpp 

Log message:
        Make credits translatable, I've needed to move the string vector inside 
a
        function because otherwise I couldn't call gettext because the 
textdomain wasn't
        still set. Have a look at it, Dave.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/about.cpp.diff?tr1=1.54&tr2=1.55&r1=text&r2=text

Patches:
Index: wesnoth/src/about.cpp
diff -u wesnoth/src/about.cpp:1.54 wesnoth/src/about.cpp:1.55
--- wesnoth/src/about.cpp:1.54  Sun Aug 29 14:05:41 2004
+++ wesnoth/src/about.cpp       Tue Aug 31 12:00:24 2004
@@ -1,4 +1,4 @@
-/* $Id: about.cpp,v 1.54 2004/08/29 14:05:41 isaaccp Exp $ */
+/* $Id: about.cpp,v 1.55 2004/08/31 12:00:24 isaaccp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -27,200 +27,204 @@
 namespace about
 {
 
-static const std::string credits[] = {
-       " ",
-       "- ",
-       " ",
-       "- ",
-       " ",
-       "- ",
-       " ",
-       "- ",
-       " ",
-       "- ",
-       " ",
-       "- ",
-
-       "+Core Developers",
-       "-   Main Developer",
-       "   David White (Sirp)",
-       "- ",
-       "-   Artwork and graphics designer",
-       "   Francisco Muñoz (fmunoz)",
-       "+ ",
-
-       "+Developers",
-       "-   Alfredo Beaumont (ziberpunk)",
-       "-   Cyril Bouthors (CyrilB)",
-       "-   Isaac Clerencia",
-       "-   John B. Messerly",
-       "-   Justin Zaun (jzaun)",
-       "-   J.R. Blain (Cowboy)",
-       "-   Kristoffer Erlandsson (erl)",
-       "-   Philippe Plantier (Ayin)",
-       "-   Zas",
-       "+ ",
-
-       "+General Purpose Administrators",
-       "-   Cedric Duval",
-       "-   Crossbow/Miyo",
-       "+ ",
-
-       "+Artwork and graphics designers",
-       "-   Andrew James Patterson (Kamahawk)",
-       "-   Christophe Anjard",
-       "-   Diego Brea (Cobretti)",
-       "-   Eli Dupree (Elvish Pillager)",
-       "-   Gareth Miller (Gafgarion)",
-       "-   Hogne HÃ¥skjold (frame)",
-       "-   James Barton (Sangel)",
-       "-   Jimmy Olsson (Azlan)",
-       "-   Johanna Manninen (lohari)",
-       "-   John Muccigrosso (Eponymous Archon)",
-       "-   John-Robert Funck (XJaPaN)",
-       "-   Jonatan Alamà (tin)",
-       "-   Joseph Simmons (Turin)",
-       "-   J.W. Bjerk (Eleazar)",
-       "-   J.W.C. McNabb (Darth Fool)",
-       "-   Neorice",
-       "-   Richard Kettering (Jetryl)",
-       "-   Slainte",
-       "-   Svetac",
-       "+ ",
-
-       "+Music",
-       "-   Aleksi",
-       "-   Fredrik Lindroth",
-       "-   Joseph Toscano (zhaymusic.com)",
-       "-   Pau Congost",
-       "+ ",
-
-       "+Scenario Designers",
-       "-   Benjamin Drieu",
-       "-   David White (Sirp)",
-       "-   Francisco Muñoz (fmunoz)",
-       "-   James Spencer (Shade)",
-       "-   Joseph Simmons (Turin)",
-       "-   Justin Zaun (jzaun)",
-       "+ ",
-
-       "+Packagers",
-       "-   Darryl Dixon",
-       "-   Jay Hopping",
-       "-   Marcin Konicki (ahwayakchih)",
-       "-   Marcus Phillips (Sithrandel)",
-       "-   Mark Michelsen (skovbaer)",
-       "+ ",
-
-       "+Miscellaneous",
-       "-   Francesco Gigli (Jaramir)",
-       "-   Jordà Polo (ettin)",
-       "-   Tom Chance (telex4)",
-       "+ ",
-
-       "+Internationalization Manager",
-       "-   Mark Michelsen (skovbaer)",
-       "+ ",
-
-       "+Brazilian Translation",
-       "-   Ambra Viviani Loos",
-       "-   Michel Loos",
-       "+ ",
-
-       "+Catalan Translation",
-       "-   Dan Rosàs Garcia (focks)",
-       "-   Jordà Polo (ettin)",
-       "+ ",
-
-       "+Danish Translation",
-       "-   Mark Michelsen (skovbaer)",
-       "+ ",
-
-       "+Dutch Translation",
-       "-   Lala",
-       "+ ",
-
-       "+Finnish Translation",
-       "-   paxed",
-       "+ ",
-
-       "+French Translation",
-       "-   Benoit Astruc",
-       "-   Guillaume Duwelz-Rebert",
-       "-   DaringTremayne",
-       "-   Zas",
-       "+ ",
-
-       "+German Translation",
-       "-   Arndt Muehlenfeld",
-       "-   ja-el",
-       "-   Jonas",
-       "-   ammoq",
-       "+ ",
-
-       "+Hungarian Translation",
-       "-   Khiraly",
-       "-   Széll Tamás (TomJoad)",
-       "+ ",
-
-       "+Italian Translation",
-       "-   crys0000",
-       "-   Federico Tomassetti",
-       "-   isazi",
-       "-   RokStar",
-       "+ ",
-
-       "+Norwegian Translation",
-       "-   Hallvard Norheim Bø (Lysander)",
-       "-   Erik J. Mesoy (Circon)",
-       "+ ",
-
-       "+Polish Translation",
-       "-   Artur R. Czechowski",
-       "-   methinks",
-       "-   BOrsuk",
-       "+ ",
-
-       "+Portuguese Translation",
-       "-   Celso Goya",
-       "-   Renato Cunha",
-       "+ ",
-
-       "+Slovak Translation",
-       "-   Viliam Bur",
-       "+ ",
-
-       "+Spanish Translation",
-       "-   Franciso Muñoz (fmunoz)",
-       "-   Gabriel Rodríguez (Chewie))",
-       "-   Jose Gordillo (kilder)",
-       "-   Jose Manuel Gomez (joseg)",
-       "+ ",
-
-       "+Swedish Translation",
-       "-   Alexander Kjäll (capitol)",
-       "-   wint3r",
-       "+ ",
-
-       "+Contributors",
-       "-   Cyril Bouthors (CyrilB)",
-       "-   edge",
-       "-   Frédéric Wagner",
-       "-   Jan Zvánovec (jaz)",
-       "-   Maksim Orlovich (SadEagle)",
-       "+ ",
-
-       "+ Bots",
-       "-   wesbot",
-       "+ "
-};
-
 std::vector<std::string> get_text() {
+       static const std::string credits[] = {
+               " ",
+               "- ",
+               " ",
+               "- ",
+               " ",
+               "- ",
+               " ",
+               "- ",
+               " ",
+               "- ",
+               " ",
+               "- ",
+
+               _("+Core Developers"),
+               _("-   Main Developer"),
+               "   David White (Sirp)",
+               "- ",
+               _("-   Artwork and graphics designer"),
+               "   Francisco Muñoz (fmunoz)",
+               "+ ",
+
+               _("+Developers"),
+               "-   Alfredo Beaumont (ziberpunk)",
+               "-   Cyril Bouthors (CyrilB)",
+               "-   Isaac Clerencia",
+               "-   John B. Messerly",
+               "-   Justin Zaun (jzaun)",
+               "-   J.R. Blain (Cowboy)",
+               "-   Kristoffer Erlandsson (erl)",
+               "-   Philippe Plantier (Ayin)",
+               "-   Zas",
+               "+ ",
+
+               _("+General Purpose Administrators"),
+               "-   Cedric Duval",
+               "-   Crossbow/Miyo",
+               "+ ",
+
+               _("+Artwork and graphics designers"),
+               "-   Andrew James Patterson (Kamahawk)",
+               "-   Christophe Anjard",
+               "-   Diego Brea (Cobretti)",
+               "-   Eli Dupree (Elvish Pillager)",
+               "-   Gareth Miller (Gafgarion)",
+               "-   Hogne HÃ¥skjold (frame)",
+               "-   James Barton (Sangel)",
+               "-   Jimmy Olsson (Azlan)",
+               "-   Johanna Manninen (lohari)",
+               "-   John Muccigrosso (Eponymous Archon)",
+               "-   John-Robert Funck (XJaPaN)",
+               "-   Jonatan Alamà (tin)",
+               "-   Joseph Simmons (Turin)",
+               "-   J.W. Bjerk (Eleazar)",
+               "-   J.W.C. McNabb (Darth Fool)",
+               "-   Neorice",
+               "-   Richard Kettering (Jetryl)",
+               "-   Slainte",
+               "-   Svetac",
+               "+ ",
+
+               _("+Music"),
+               "-   Aleksi",
+               "-   Fredrik Lindroth",
+               "-   Joseph Toscano (zhaymusic.com)",
+               "-   Pau Congost",
+               "+ ",
+
+               _("+Scenario Designers"),
+               "-   Benjamin Drieu",
+               "-   David White (Sirp)",
+               "-   Francisco Muñoz (fmunoz)",
+               "-   James Spencer (Shade)",
+               "-   Joseph Simmons (Turin)",
+               "-   Justin Zaun (jzaun)",
+               "+ ",
+
+               _("+Packagers"),
+               "-   Darryl Dixon",
+               "-   Jay Hopping",
+               "-   Marcin Konicki (ahwayakchih)",
+               "-   Marcus Phillips (Sithrandel)",
+               "-   Mark Michelsen (skovbaer)",
+               "+ ",
+
+               _("+Miscellaneous"),
+               "-   Francesco Gigli (Jaramir)",
+               "-   Jordà Polo (ettin)",
+               "-   Tom Chance (telex4)",
+               "+ ",
+
+               _("+Internationalization Manager"),
+               "-   Mark Michelsen (skovbaer)",
+               "+ ",
+
+               _("+Brazilian Translation"),
+               "-   Ambra Viviani Loos",
+               "-   Michel Loos",
+               "+ ",
+
+               _("+Catalan Translation"),
+               "-   Dan Rosàs Garcia (focks)",
+               "-   Jordà Polo (ettin)",
+               "+ ",
+
+               _("+Danish Translation"),
+               "-   Mark Michelsen (skovbaer)",
+               "+ ",
+
+               _("+Dutch Translation"),
+               "-   Lala",
+               "+ ",
+
+               _("+Finnish Translation"),
+               "-   paxed",
+               "+ ",
+
+               _("+French Translation"),
+               "-   Benoit Astruc",
+               "-   Guillaume Duwelz-Rebert",
+               "-   DaringTremayne",
+               "-   Zas",
+               "+ ",
+
+               _("+German Translation"),
+               "-   Arndt Muehlenfeld",
+               "-   ja-el",
+               "-   Jonas",
+               "-   ammoq",
+               "+ ",
+
+               _("+Hungarian Translation"),
+               "-   Khiraly",
+               "-   Széll Tamás (TomJoad)",
+               "+ ",
+
+               _("+Italian Translation"),
+               "-   crys0000",
+               "-   Federico Tomassetti",
+               "-   isazi",
+               "-   RokStar",
+               "+ ",
+
+               _("+Norwegian Translation"),
+               "-   Hallvard Norheim Bø (Lysander)",
+               "-   Erik J. Mesoy (Circon)",
+               "+ ",
+
+               _("+Polish Translation"),
+               "-   Artur R. Czechowski",
+               "-   methinks",
+               "-   BOrsuk",
+               "+ ",
+
+               _("+Portuguese Translation"),
+               "-   Celso Goya",
+               "-   Renato Cunha",
+               "+ ",
+
+               _("+Slovak Translation"),
+               "-   Viliam Bur",
+               "+ ",
+
+               _("+Spanish Translation"),
+               "-   Franciso Muñoz (fmunoz)",
+               "-   Gabriel Rodríguez (Chewie))",
+               "-   Jose Gordillo (kilder)",
+               "-   Jose Manuel Gomez (joseg)",
+               "+ ",
+
+               _("+Swedish Translation"),
+               "-   Alexander Kjäll (capitol)",
+               "-   wint3r",
+               "+ ",
+
+               _("+Contributors"),
+               "-   Cyril Bouthors (CyrilB)",
+               "-   edge",
+               "-   Frédéric Wagner",
+               "-   Jan Zvánovec (jaz)",
+               "-   Maksim Orlovich (SadEagle)",
+               "+ ",
+
+               _("+ Bots"),
+               "-   wesbot",
+               "+ "
+       };
+
        return std::vector<std::string>(credits, credits + sizeof(credits) / 
sizeof(*credits));
 }
 
 void show_about(display& disp)
 {
+       static const std::string woo[] = {
+       _("-   Main Developer"),
+       "- "};
+       std::cerr << woo[0] << std::endl;
        std::vector<std::string> text = get_text();
        SDL_Rect rect = {0, 0, disp.x(), disp.y()};
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]