[glom] DbUtils: get_database_preferences(): Use a specific locale.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] DbUtils: get_database_preferences(): Use a specific locale.
- Date: Thu, 28 Nov 2013 21:42:47 +0000 (UTC)
commit 64b15d2aefa0dbe8cd8f7cb131c31c172d60d828
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Nov 28 22:42:18 2013 +0100
DbUtils: get_database_preferences(): Use a specific locale.
glom/libglom/db_utils.cc | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/glom/libglom/db_utils.cc b/glom/libglom/db_utils.cc
index f654ddb..66b7847 100644
--- a/glom/libglom/db_utils.cc
+++ b/glom/libglom/db_utils.cc
@@ -378,14 +378,15 @@ SystemPrefs get_database_preferences(const Document* document)
Glib::RefPtr<Gnome::Gda::DataModel> datamodel = query_execute_select(builder);
if(datamodel && (datamodel->get_n_rows() != 0))
{
- result.m_name = Conversions::get_text_for_gda_value(Field::TYPE_TEXT, datamodel->get_value_at(0, 0));
- result.m_org_name = Conversions::get_text_for_gda_value(Field::TYPE_TEXT, datamodel->get_value_at(1,
0));
- result.m_org_address_street = Conversions::get_text_for_gda_value(Field::TYPE_TEXT,
datamodel->get_value_at(2, 0));
- result.m_org_address_street2 = Conversions::get_text_for_gda_value(Field::TYPE_TEXT,
datamodel->get_value_at(3, 0));
- result.m_org_address_town = Conversions::get_text_for_gda_value(Field::TYPE_TEXT,
datamodel->get_value_at(4, 0));
- result.m_org_address_county = Conversions::get_text_for_gda_value(Field::TYPE_TEXT,
datamodel->get_value_at(5, 0));
- result.m_org_address_country = Conversions::get_text_for_gda_value(Field::TYPE_TEXT,
datamodel->get_value_at(6, 0));
- result.m_org_address_postcode = Conversions::get_text_for_gda_value(Field::TYPE_TEXT,
datamodel->get_value_at(7, 0));
+ const std::locale locale(std::locale::classic()); //Ignored for text types, but it's best to avoid
ever using the current arbitrary locale here.
+ result.m_name = Conversions::get_text_for_gda_value(Field::TYPE_TEXT, datamodel->get_value_at(0, 0),
locale);
+ result.m_org_name = Conversions::get_text_for_gda_value(Field::TYPE_TEXT, datamodel->get_value_at(1,
0), locale);
+ result.m_org_address_street = Conversions::get_text_for_gda_value(Field::TYPE_TEXT,
datamodel->get_value_at(2, 0), locale);
+ result.m_org_address_street2 = Conversions::get_text_for_gda_value(Field::TYPE_TEXT,
datamodel->get_value_at(3, 0), locale);
+ result.m_org_address_town = Conversions::get_text_for_gda_value(Field::TYPE_TEXT,
datamodel->get_value_at(4, 0), locale);
+ result.m_org_address_county = Conversions::get_text_for_gda_value(Field::TYPE_TEXT,
datamodel->get_value_at(5, 0), locale);
+ result.m_org_address_country = Conversions::get_text_for_gda_value(Field::TYPE_TEXT,
datamodel->get_value_at(6, 0), locale);
+ result.m_org_address_postcode = Conversions::get_text_for_gda_value(Field::TYPE_TEXT,
datamodel->get_value_at(7, 0), locale);
//We need to be more clever about these column indexes if we add more new fields:
if(optional_org_logo)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]