IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

2002-11-30 Christian Stimming <stimming@tuhh.de>

Browse Source 
* src/app-utils/gnc-ui-util.[hc]: Added
	gnc_locale_default_currency_nodefault function since
	locale_default_currency might return a non-locale related
	currency. Fix xaccSPrintAmount. Fixes #95404.

	* src/engine/iso-4217-currencies.scm ("rouble"): Fix mnemonic for
	Russian Rouble which is "RUR" instead of RUB.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@7574 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming
2002-11-30 13:38:34 +00:00
parent 30fe18b651
commit a0e5b8f830
4 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/app-utils/gnc-ui-util.c
View File

@@ -1060,7 +1060,7 @@ gnc_locale_default_iso_currency_code (void)
}
gnc_commodity *
gnc_locale_default_currency (void)
gnc_locale_default_currency_nodefault (void)
{
gnc_commodity * currency;
gnc_commodity_table *table;
@@ -1071,10 +1071,17 @@ gnc_locale_default_currency (void)
currency = gnc_commodity_table_lookup (table, GNC_COMMODITY_NS_ISO, code);
if (currency)
return currency;
return (currency ? currency : NULL);
}
return gnc_commodity_table_lookup (table, GNC_COMMODITY_NS_ISO, "USD");
gnc_commodity *
gnc_locale_default_currency (void)
{
gnc_commodity * currency = gnc_locale_default_currency_nodefault ();
return (currency ? currency :
gnc_commodity_table_lookup (gnc_get_current_commodities (),
GNC_COMMODITY_NS_ISO, "USD"));
}
@@ -1547,8 +1554,12 @@ xaccSPrintAmount (char * bufp, gnc_numeric val, GNCPrintAmountInfo info)
if (info.use_symbol)
{
if (gnc_commodity_equiv (info.commodity, gnc_locale_default_currency ()))
/* There was a bug here: don't use gnc_locale_default_currency */
if (gnc_commodity_equiv (info.commodity,
gnc_locale_default_currency_nodefault ()))
{
currency_symbol = lc->currency_symbol;
}
else
{
if (info.commodity &&