Author: silene
Date: Sat Jun 27 10:40:00 2009
New Revision: 36421
URL: http://svn.gna.org/viewcvs/wesnoth?rev=36421&view=rev
Log:
Set LC_TIME locale at the same place as other locales. (Fixes bug #13782.)
Modified:
branches/1.6/changelog
branches/1.6/src/dialogs.cpp
branches/1.6/src/language.cpp
Modified: branches/1.6/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.6/changelog?rev=36421&r1=36420&r2=36421&view=diff
==============================================================================
--- branches/1.6/changelog (original)
+++ branches/1.6/changelog Sat Jun 27 10:40:00 2009
@@ -6,6 +6,7 @@
* Miscellaneous and bugfixes:
* Properly translate dialog title (bug #13761)
* Properly translate unit name and mark strings translatable (bug #13751)
+ * Fixed dates in the load box being untranslated (bug #13782)
Version 1.6.3:
* Campaigns:
Modified: branches/1.6/src/dialogs.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.6/src/dialogs.cpp?rev=36421&r1=36420&r2=36421&view=diff
==============================================================================
--- branches/1.6/src/dialogs.cpp (original)
+++ branches/1.6/src/dialogs.cpp Sat Jun 27 10:40:00 2009
@@ -501,7 +501,6 @@
SDL_BlitSurface(map_surf,NULL,screen,&map_rect);
}
- char* old_locale = std::setlocale(LC_TIME,
get_locale().localename.c_str());
char time_buf[256] = {0};
const save_info& save = (*info_)[index_];
tm* tm_l = localtime(&save.time_modified);
@@ -512,10 +511,6 @@
}
} else {
LOG_NG << "localtime() returned null for time " <<
save.time_modified << ", save " << save.name;
- }
-
- if(old_locale) {
- std::setlocale(LC_TIME, old_locale);
}
std::stringstream str;
Modified: branches/1.6/src/language.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.6/src/language.cpp?rev=36421&r1=36420&r2=36421&view=diff
==============================================================================
--- branches/1.6/src/language.cpp (original)
+++ branches/1.6/src/language.cpp Sat Jun 27 10:40:00 2009
@@ -304,6 +304,7 @@
current_language = locale;
wesnoth_setlocale(LC_MESSAGES, locale.localename, &locale.alternates);
wesnoth_setlocale(LC_COLLATE, locale.localename, &locale.alternates);
+ wesnoth_setlocale(LC_TIME, locale.localename, &locale.alternates);
// fill string_table (should be moved somwhere else some day)
try {
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
