X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finternational.cc;h=2e6a09df9fcaf1456097c0d601a3f06cae34018c;hb=d2c221f6d589ad75568cb6a9a9eb6ba67196af51;hp=1bdc1a3b900ac85263bb3f2f455bd2040fa6cf96;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git

diff --git a/flower/international.cc b/flower/international.cc
index 1bdc1a3b90..2e6a09df9f 100644
--- a/flower/international.cc
+++ b/flower/international.cc
@@ -1,12 +1,25 @@
 /*
-  international.cc -- implement stuff for internationalisation
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2012 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "config.hh"
+
+#include "international.hh"
 #include "string-convert.hh"
 
 #if !HAVE_GETTEXT
@@ -19,25 +32,31 @@ gettext (char const *s)
 #include <libintl.h>
 #endif
 
-String
+string
 _ (char const *ch)
 {
-  return String (gettext (ch));
+  return string (gettext (ch));
 }
 
-String
+string
 _f (char const *format, ...)
 {
   va_list args;
   va_start (args, format);
-  String str = String_convert::vform_string (gettext (format), args);
+  string str = v_f (format, args);
   va_end (args);
   return str;
 }
 
-String
-_f (char const *format, String s, String s2, String s3)
+string
+v_f (char const *format, va_list args)
+{
+  return String_convert::vform_string (gettext (format), args);
+}
+
+string
+_f (char const *format, const string &s, const string &s2, const string &s3)
 {
-  return String_convert::form_string (gettext (format), s.to_str0 (), s2.to_str0 (),
-				      s3.to_str0 ());
+  return String_convert::form_string (gettext (format), s.c_str (), s2.c_str (),
+                                      s3.c_str ());
 }