[Csp-commits] svn:csp r2131 - in trunk/csp: cspsim/wf data/ui/localization/svenska

[<sv...@ww...>]

Author: nsmoooose
Date: 2007-06-17 12:31:13 -0700 (Sun, 17 Jun 2007)
New Revision: 2131

Modified:
   trunk/csp/cspsim/wf/ControlGeometryBuilder.cpp
   trunk/csp/data/ui/localization/svenska/global.xml
Log:
Added support for non a-z characters. All user interface xml files are expected to be in UTF8 format.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2131

Modified: trunk/csp/cspsim/wf/ControlGeometryBuilder.cpp
===================================================================
--- trunk/csp/cspsim/wf/ControlGeometryBuilder.cpp	2007-06-16 16:32:24 UTC (rev 2130)
+++ trunk/csp/cspsim/wf/ControlGeometryBuilder.cpp	2007-06-17 19:31:13 UTC (rev 2131)
@@ -66,7 +66,7 @@
 
 osgText::Text* ControlGeometryBuilder::buildText(const std::string& text, const std::string& fontFamily, float fontSize, osg::Vec4& color) const {
     osg::ref_ptr<osgText::Text> textNode = new osgText::Text;
-    textNode->setText(text);
+    textNode->setText(text, osgText::String::ENCODING_UTF8);
     textNode->setColor(color);
     textNode->setFont(fontFamily.c_str());
     textNode->setCharacterSize(fontSize);
@@ -572,7 +572,7 @@
 
 		getNextLayer(z);
 		osg::ref_ptr<osgText::Text> button_text = new osgText::Text;
-		button_text->setText(parsedText);
+		button_text->setText(parsedText, osgText::String::ENCODING_UTF8);
 		button_text->setColor(*style.color);
 		button_text->setAlignment(osgText::Text::LEFT_CENTER);
 		button_text->setFont(style.fontFamily->c_str());

Modified: trunk/csp/data/ui/localization/svenska/global.xml
===================================================================
--- trunk/csp/data/ui/localization/svenska/global.xml	2007-06-16 16:32:24 UTC (rev 2130)
+++ trunk/csp/data/ui/localization/svenska/global.xml	2007-06-17 19:31:13 UTC (rev 2131)
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <StringTableDocument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation='../../window_document.xsd'>
 	<Strings>
 		<String key="cancel">Avbryt</String>
-		<String key="credits">Berom</String>
+		<String key="credits">Beröm</String>
 		<String key="csp">Combat Simulator Project</String>
-		<String key="full_screen_mode">Helskarm</String>
-		<String key="help">Hjalp</String>
+		<String key="full_screen_mode">Helskärm</String>
+		<String key="help">Hjälp</String>
 		<String key="help_mouse">Mus</String>
 		<String key="help_keyboard_view">Vyer</String>
-		<String key="help_welcome">Valkommen</String>
+		<String key="help_welcome">Välkommen</String>
 		<String key="help_joystick">Joystick</String>
 		<String key="help_f16_first_steps">F16 Start</String>
 		<String key="help_keyboard_aircraft">Flygplans kontroller</String>
 		<String key="instant_action">Action</String>
 		<String key="main_menu">Huvudmeny</String>
-		<String key="multiplayer">Natverk</String>
+		<String key="multiplayer">Nätverk</String>
 		<String key="ok">OK</String>
-		<String key="options">Installningar</String>
+		<String key="options">Inställningar</String>
 		<String key="pause">Paus</String>
 		<String key="quit">Avsluta</String>
-		<String key="restart_required">Omstart kravs for att andring skall galla.</String>
-		<String key="resume">Aterga</String>
-		<String key="screen_resolution">Upplosning</String>
+		<String key="restart_required">Omstart krävs fär att ändring skall gälla.</String>
+		<String key="resume">Återgå</String>
+		<String key="screen_resolution">Upplösning</String>
 		<String key="singleplayer">1 spelare</String>
 		<String key="tutorials">Handledning</String>
 		<String key="ui_theme">Tema</String>
-		<String key="ui_language">Sprak</String>
+		<String key="ui_language">Språk</String>
 	</Strings>
 </StringTableDocument>
\ No newline at end of file