Commit Graph

43 Commits

Author SHA1 Message Date
Jordi Vilalta Prat
a17c07bcaa I18N: Improve the fallback language auto-detection.
- Broaden the range of language tags that could be accepted as fallback in
  auto-detection. For example, for a system with locale 'pt_PT', all of
  these would be accepted as valid fallbacks: 'pt_PT_*', 'pt', 'pt_*'
- Make language codes matching case-insensitive as specified in RFC 4647.
- Add support language code blocks longer than 2 characters.

svn-id: r54715
2010-12-01 20:00:40 +00:00
Jordi Vilalta Prat
8393bc5b5f I18N: Don't build TranslationManager when translation is disabled.
svn-id: r54684
2010-11-30 18:50:19 +00:00
Johannes Schickel
1ad63b431e BACKEND: Switch OSystem::getSystemLanguage return type to Common::String.
This is done as discussed on -devel.

svn-id: r54516
2010-11-28 02:12:33 +00:00
Johannes Schickel
ebbd504b90 COMMON: Adapt translation manager to use the OSystem for language detection.
svn-id: r54480
2010-11-25 18:42:05 +00:00
Max Horn
785590e504 COMMON: Push include file.h and fs.h from translation.h to translation.cpp
svn-id: r54357
2010-11-19 01:03:05 +00:00
Max Horn
abe1959d36 COMMON: Simplify DECLARE_SINGLETON macro
This makes it possible to write
  DECLARE_SINGLETON(foo);
instead of
  DECLARE_SINGLETON(foo)
without causing a warning about an extra semicolon.
The extra semicolon helps some editors at parsing the C++ code.

svn-id: r54258
2010-11-16 08:23:13 +00:00
Thierry Crozat
4e357549d5 COMMON: Fix TranslationManager
Revision 54206 broke translations support because it uncovered a bug in
the TranslationManager when reading the translations.dat file. In that file
all the stored string lengths include the terminating 0 but Common::String
expect a length without the terminating 0. Therefore all String objects
created from reading the translations.dat file had an incorrect size. This
caused the font file names to be wrong after adding the charset.

svn-id: r54235
2010-11-13 23:27:13 +00:00
Johannes Schickel
c624202c39 COMMON: Fix compilation when translation support is disabled (regression from r54207).
svn-id: r54209
2010-11-11 19:20:26 +00:00
Max Horn
cc61445599 COMMON: Cleanup translation manager code; add FIXME
svn-id: r54206
2010-11-11 18:22:35 +00:00
Jordi Vilalta Prat
8388e0dfea JANITORAL: Clean trailing whitespaces.
svn-id: r53160
2010-10-12 02:18:11 +00:00
Thierry Crozat
1177692701 GUI: Fix bug #3075649 (Fonts not found with built-in theme)
When switching to a theme that do not have the fonts needed to properly
display the current language, it now revert to the previously used theme
and display an error message telling the user to change the language
first if he wants to use the theme he selected.

svn-id: r52969
2010-10-01 21:41:40 +00:00
Thierry Crozat
a2a3073562 I18N: Look for translations data file in Themes path
If the translations.dat file is not found using the SearchMan, it now looks
for that file into the themepath directory and sub-directories (if the path is
defined).

svn-id: r52428
2010-08-28 15:51:23 +00:00
Thierry Crozat
bc821136fd i18n: Add support for context in translations.
This change means there can now be different translations for the same
english string depending on the context. It is based on gettext msgctxt feature.
There is a new macro _c(msg, ctxt) that should be used instead of _(msg) in
the source code when we want to add a context to the message. For the
moment I have added contexts to only one message ("None") so that I could
test the changes. Context could be added also to get shorter translations when
GUI is in 1x mode.

I have also added back the fuzzy option to msmerge since it is useful when
adding contexts to populate the translations for the new contexts.

svn-id: r52308
2010-08-23 19:45:14 +00:00
Johannes Schickel
ff06f0c9d5 i18n: Changed wording of messages about translations.dat file.
svn-id: r52261
2010-08-21 14:05:38 +00:00
Johannes Schickel
7fd7689370 i18n: Formatting fixes.
svn-id: r52260
2010-08-21 13:38:08 +00:00
Johannes Schickel
a53d4dde66 i18n: Style fixes.
svn-id: r52257
2010-08-21 13:21:09 +00:00
Thierry Crozat
9015a14531 i18n: Fix previous commit when translation support is disabled
Previous commit of translation.cpp introduced a defined but not
implemented operator when the translation support was disabled.
This was probably fine since it was not used, but not very clean.

svn-id: r52241
2010-08-20 21:04:39 +00:00
Thierry Crozat
d00b8a5753 i18n: Sort the list of available languages alphabetically
svn-id: r52239
2010-08-20 20:42:13 +00:00
Eugene Sandulenko
040dfff8ce i18n: Move translations to standalone file. Patch #3044975
svn-id: r52208
2010-08-19 11:46:55 +00:00
Thierry Crozat
797012eb5c i18n: Fix link error when localization is disabled
This fix a regression introduced in revision 50448 ("Add support for
locale-dependant font'). When disabling localization a function was
declared, called but not implemented.

svn-id: r52048
2010-08-12 23:09:38 +00:00
Thierry Crozat
1c6b339bbc i18n: use user friendly language names in GUI
The GUI now uses the content of the Language field from the po file
header if it is present and not empty for the language selection
PopupWidget. If not present it uses the file name as before (e.g.
ru_RU).

Also update all the translation template and all the translation files.

svn-id: r51542
2010-07-31 15:46:43 +00:00
Johannes Schickel
e5e94d4511 Strip trailing whitespaces in our common code base.
svn-id: r51094
2010-07-21 18:17:51 +00:00
Eugene Sandulenko
0e7ccb896d i18n: Add support for locale-dependent fonts
Currently it ws not decided where to put fonts, but if you put BDF files into
themepath, they will get picked up.

The font name has to contain same codepage specification as in the .po file,
i.e. fixed5x8-iso-8859-5.bdf for Cyrillic codepage. In case the font does not
exist, default will be used.

All built in fonts get proper names.

TODO: Currently there is a bug with our font cacher. Font clR6x12-iso-8859-5
is empty after loading from FCC file. Reason is unknown.

svn-id: r50448
2010-06-28 15:17:10 +00:00
Johannes Schickel
4ec0827551 Add some explanation why we can not just use setlocale on Win32.
svn-id: r50354
2010-06-26 23:01:12 +00:00
Johannes Schickel
b7ab6ca3f1 Use "C" on Win32 as syslang in case the locale could not be determined.
svn-id: r50353
2010-06-26 22:51:13 +00:00
Johannes Schickel
14fdd11c04 Fix compilation with our default build system when USE_DETECTLANG is specified.
svn-id: r50349
2010-06-26 22:44:43 +00:00
Johannes Schickel
578cdb2aeb Implement support for auto detection of the users preferred locale on Windows.
Note that this might break support for Windows versions older than Win2k,
at least according to the MSVC docs GetLocaleInfo is only supported by Win2k+.

I added a comment about that though.

svn-id: r50348
2010-06-26 22:32:51 +00:00
Johannes Schickel
58fcda82f3 Remove support for translation of console messages.
In recent discussions on -devel it turned out, that this
feature is rather superfluous and instead we should rather
implement a proper error reporting in our GUI.

I also removed the dependency on iconv along with this.

svn-id: r50335
2010-06-26 18:07:41 +00:00
Torbjörn Andersson
38b172e8e5 Fixed some Cppcheck warnings. (There are plenty left, if anyone's wondering.)
svn-id: r50120
2010-06-21 19:32:25 +00:00
Johannes Schickel
d869d1370e Properly provide stub implementations for all TranslationManager methods when USE_TRANSLATIONS is not defined.
svn-id: r49997
2010-06-18 02:25:33 +00:00
David Turner
e5f609a40a Correction for Invalid reads in Translation iconv calls reported by Valgrind.
The string terminators were omitted from the iconv call and not restored.

svn-id: r49916
2010-06-17 03:22:52 +00:00
Johannes Schickel
49463c2bf9 Use USE_TRANSLATION, USE_DETECTLANG and USE_TERMCONV instead of (ENABLE_)TRANSLATION, DETECTLANG and TERMCONV.
svn-id: r49885
2010-06-15 19:20:58 +00:00
Johannes Schickel
a42ea73a76 Simplify code for the "ICONV_USES_CONST" case even more. (i.e. remove the "msg" variable there).
svn-id: r49880
2010-06-15 17:56:05 +00:00
Andre Heider
212d0ac28c Fix compilation when using ICONV_USES_CONST.
svn-id: r49878
2010-06-15 17:50:14 +00:00
Johannes Schickel
d8bc798145 Strip out charset information from the system locale again (like it was done before r49871).
Unlike with the old code, we know allow for locales
with a different size than 5 though.

svn-id: r49876
2010-06-15 17:47:23 +00:00
Johannes Schickel
34d8196334 Output some warning in case an invalid ID was passed to TranslationManager::getLangById.
svn-id: r49873
2010-06-15 17:34:26 +00:00
Johannes Schickel
0bff5c29fe Use a Common::String instead of a fixed size array for _syslang in TranslationManager.
svn-id: r49871
2010-06-15 17:33:45 +00:00
Willem Jan Palenstijn
7c7054dbd1 Remove unnecessary svn:executable properties
svn-id: r49870
2010-06-15 17:14:38 +00:00
Johannes Schickel
c09af1dcae Some style fixes.
svn-id: r49869
2010-06-15 17:14:02 +00:00
Johannes Schickel
0d7c8071cc Fix iconv signature on BSD systems. (Based on what we do in tools/)
svn-id: r49868
2010-06-15 17:13:42 +00:00
Max Horn
365973542c Add TranslationManager::getTranslation variant taking/returning a Common::String (should fix WinCE build)
svn-id: r49861
2010-06-15 15:50:37 +00:00
Max Horn
44ce741f9c Code formatting
svn-id: r49859
2010-06-15 15:39:59 +00:00
Eugene Sandulenko
859212df25 Implement translation support for ScummVM GUI.
Based on patch #2903830: "Updated Translation Prototype" by alexbevi
which in turn is based on patch #1739965 by jvprat.

Currently it builds all translations right into ScummVM. Once the
feature will be accepted more widely, i.e. more translations will
pop up, it will be trivial to move translation strings to external
file.

Finished translation: Russian
Unfinished translation: Hungarian

Things which are nice to do:
 - Language code -> language mapping for more user friendness
 - Specifying fonts to be used with language
 - Updating of interface language without restart. It will require
   moving of much code to reflowLayout() methods for each dialog

The .po files must be in single byte encodings. I.e. no support
for Unicode.

svn-id: r49759
2010-06-15 10:44:51 +00:00