Kalakoi/GDevelop
1
0
Fork 0
mirror of https://github.com/4ian/GDevelop.git synced 2025-10-15 10:19:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #191 from victorlevasseur/bugfix/accentuated-char-source

Browse Source 
Fix accentuated/special characters in some source files
This commit is contained in:
Florian Rival
2015-08-30 18:13:22 +02:00
parent 701ac1d4d0 68c995221e
commit 541abb8020
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Core/GDCore/Tools/Localization.h
View File

@@ -10,10 +10,10 @@
#include <wx/intl.h>
#include "GDCore/String.h"
//Create a new macro to return UTF8 gd::String from a translation
#if defined(_)
#if defined(_)
#undef _
#endif
#define _(s) gd::String(wxGetTranslation(u8##s))
#define _(s) gd::String(wxGetTranslation(wxString::FromUTF8(u8##s)))
#else
//Create a new macro to return UTF8 gd::String from a translation
#if defined(_)

2
Extensions/PhysicsBehavior/Extension.cpp
View File

@@ -215,7 +215,7 @@ public:
aut.AddAction("ApplyImpulseUsingPolarCoordinates",
_("Apply an impulse (angle)"),
_("Apply an impulse to an object, using a angle and a length as coordinates."),
_("Apply to _PARAM0_ impulse _PARAM3_ with angle: _PARAM2_<EFBFBD>"),
_("Apply to _PARAM0_ impulse _PARAM3_ with angle: _PARAM2_\302\260"), //\302\260 <=> DEGREE SIGN
_("Displacement"),
"res/physics24.png",
"res/physics16.png")

10
IDE/Credits.cpp
View File

@@ -14,6 +14,7 @@
#include <wx/string.h>
//*)
#include <wx/mimetype.h> // mimetype support
#include "GDCore/Tools/Localization.h"
#include "GDCore/Tools/VersionWrapper.h"
#include <string>
#include <vector>
@@ -218,9 +219,10 @@ Credits::Credits(wxWindow* parent)
gd::String status = gd::VersionWrapper::Status();
gd::String version ="GDevelop " + nbversion + " " + status + " (UTF8)";
StaticText1->SetLabel(version);
HtmlWindow1->SetPage("<html>\n<body>\n<h5>"+_("Contributors: (No special order)")+"</h5>\n"
HtmlWindow1->SetPage(gd::String("<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" /></head>\n<body>\n<h5>"
+_("Contributors: (No special order)")+"</h5>\n"
+"<br>"
+_("Fran<EFBFBD>ois Dumortier : GDevelop logo design and website conception.")+"<br>"
+_("Fran\303\247ois Dumortier : GDevelop logo design and website conception.")+"<br>"
+"( <a href=\"http://www.fdumortier.com\">http://www.fdumortier.com</a> )"+"<br>"
+"<br>"
+_("Victor Levasseur: Widgets, Advanced XML and Tiled Sprite extensions and contributions to Physics Engine, Text object, Video object, Path behavior and Sound object extension.")+"<br>"
@@ -240,7 +242,7 @@ Credits::Credits(wxWindow* parent)
+"<br>"
+_("Thomas Flecy: Original Sound object extension")+"<br>"
+"<br>"
+_("Fernando Jos<EFBFBD> Mart<72>nez L<>pez : Spanish translation of the tutorial")+"<br>"
+_("Fernando Jos\303\251 Mart\303\255nez L\303\263pez : Spanish translation of the tutorial")+"<br>"
+"<br>"
+_("conceptgame : Indiegogo super contributor. Thanks!")+"<br>"
+"<br>"
@@ -255,7 +257,7 @@ Credits::Credits(wxWindow* parent)
+_("Some images of examples came from images pack by Ari Feldman")+"<br>"
+"( <a href=\"http://www.widgetworx.com/widgetworx/portfolio/spritelib.html\">http://www.widgetworx.com/widgetworx/portfolio/spritelib.html</a> )"+"<br>"
+"<br>"
+"\n<center><h5>"+_("Thanks to all the community and users of GDevelop")+"</h5><br></center>\n</body>\n</html>");
+"\n<center><h5>"+_("Thanks to all the community and users of GDevelop")+"</h5><br></center>\n</body>\n</html>"));
FlexGridSizer3->Layout();
}