[glom] TranslatableItem::get_title_translation(): Correct fallback code.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] TranslatableItem::get_title_translation(): Correct fallback code.
- Date: Tue, 20 Dec 2011 20:46:02 +0000 (UTC)
commit 41d22cea6e59e8048d041cf97d58735d10acff80
Author: Murray Cumming <murrayc murrayc com>
Date: Tue Dec 20 21:45:55 2011 +0100
TranslatableItem::get_title_translation(): Correct fallback code.
* glom/libglom/data_structure/translatable_item.cc: This fixes make
check, which was broken after the recent change to this class.
ChangeLog | 7 +++++++
glom/libglom/data_structure/translatable_item.cc | 2 +-
2 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b6823ea..88fce51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2011-12-20 Murray Cumming <murrayc murrayc com>
+ TranslatableItem::get_title_translation(): Correct fallback code.
+
+ * glom/libglom/data_structure/translatable_item.cc: This fixes make
+ check, which was broken after the recent change to this class.
+
+2011-12-20 Murray Cumming <murrayc murrayc com>
+
Make this (Glom 1.21/22) parallel installable with glom 1.20.
* configure.ac: Increase version to 1.21.1.
diff --git a/glom/libglom/data_structure/translatable_item.cc b/glom/libglom/data_structure/translatable_item.cc
index a575aed..7b8e21c 100644
--- a/glom/libglom/data_structure/translatable_item.cc
+++ b/glom/libglom/data_structure/translatable_item.cc
@@ -92,7 +92,7 @@ Glib::ustring TranslatableItem::get_title_translation(const Glib::ustring& local
//The original is not in m_map_translations,
//but we want to handle that locale too:
- if(locale == get_current_locale())
+ if(locale == m_original_locale)
return get_title_original();
if(!fallback)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]