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

Remove configure option --enable-locale-specific-tax and make gnucash always behave as if it was set

Browse Source
This commit is contained in:
Geert Janssens 2017-10-20 20:50:33 +02:00
parent 968956d271
commit b83be1b8c6
5 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/config.h.cmake.in
View File

@ -280,9 +280,6 @@
/* Define to 1 if you have the file `/usr/src/gtest/src/gtest-all.cc'. */
#cmakedefine HAVE__USR_SRC_GTEST_SRC_GTEST_ALL_CC 1
/* Enable the experimental locale-specific tax categories */
#cmakedefine LOCALE_SPECIFIC_TAX 1
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#define LT_OBJDIR ".libs/"

9
configure.ac
View File

@ -1120,15 +1120,6 @@ fi
dnl check for nl_langinfo(D_FMT) which is missing on FreeBSD
LANGINFO_D_FMT_CHECK
dnl Enable locale-specific tax-related information in the accounts
AC_ARG_ENABLE( locale-specific-tax,
[AS_HELP_STRING([--enable-locale-specific-tax],[enable localized tax categories (experimental, but used by the german SKR04 account chart)])],
[
if test x$enableval = xyes; then
AC_DEFINE(LOCALE_SPECIFIC_TAX,1,Enable the experimental locale-specific tax categories)
fi
])
dnl Make sure we have a proper gettext installed
AC_MSG_CHECKING(for a valid gettext/gmsgfmt installation)
if test "$gt_cv_have_gettext" != "yes" || test "x$GMSGFMT" = "x"; then

8
gnucash/report/locale-specific/us/gncmod-locale-reports-us.c
View File

@ -26,10 +26,8 @@
#include "config.h"
#ifdef LOCALE_SPECIFIC_TAX
#include <string.h>
#include <locale.h>
#endif // LOCALE_SPECIFIC_TAX
#include <gmodule.h>
#include <libguile.h>
@ -68,10 +66,9 @@ libgncmod_locale_reports_us_gnc_module_init(int refcount)
{
const gchar *tax_module, *report_taxtxf, *report_locale;
/* load the tax info */
#ifdef LOCALE_SPECIFIC_TAX
/* This is a very simple hack that loads the (new, special) German
tax definition file in a German locale, or (default) loads the
previous US tax file. */
US tax file. */
# ifdef G_OS_WIN32
gchar *thislocale = g_win32_getlocale();
gboolean is_de_DE = (strncmp(thislocale, "de_DE", 5) == 0);
@ -80,9 +77,6 @@ libgncmod_locale_reports_us_gnc_module_init(int refcount)
const char *thislocale = setlocale(LC_ALL, NULL);
gboolean is_de_DE = (strncmp(thislocale, "de_DE", 5) == 0);
# endif /* G_OS_WIN32 */
#else /* !LOCALE_SPECIFIC_TAX */
gboolean is_de_DE = FALSE;
#endif /* LOCALE_SPECIFIC_TAX */
if (is_de_DE)
{
tax_module = "gnucash/tax/de_DE";

6
libgnucash/app-utils/gnc-ui-util.c
View File

@ -493,10 +493,9 @@ gnc_ui_account_get_tax_info_string (const Account *account)
GNCModule module;
const gchar *tax_module;
/* load the tax info */
#ifdef LOCALE_SPECIFIC_TAX
/* This is a very simple hack that loads the (new, special) German
tax definition file in a German locale, or (default) loads the
previous US tax file. */
US tax file. */
# ifdef G_OS_WIN32
gchar *thislocale = g_win32_getlocale();
gboolean is_de_DE = (strncmp(thislocale, "de_DE", 5) == 0);
@ -505,9 +504,6 @@ gnc_ui_account_get_tax_info_string (const Account *account)
const char *thislocale = setlocale(LC_ALL, NULL);
gboolean is_de_DE = (strncmp(thislocale, "de_DE", 5) == 0);
# endif /* G_OS_WIN32 */
#else /* LOCALE_SPECIFIC_TAX */
gboolean is_de_DE = FALSE;
#endif /* LOCALE_SPECIFIC_TAX */
tax_module = is_de_DE ?
"gnucash/tax/de_DE" :
"gnucash/tax/us";

9
libgnucash/tax/us/gncmod-tax-us.c
View File

@ -26,10 +26,8 @@
#include "config.h"
#ifdef LOCALE_SPECIFIC_TAX
#include <string.h>
#include <locale.h>
#endif // LOCALE_SPECIFIC_TAX
#include <gmodule.h>
#include <libguile.h>
@ -50,7 +48,6 @@ int libgncmod_tax_us_gnc_module_age = 0;
char *
libgncmod_tax_us_gnc_module_path(void)
{
#ifdef LOCALE_SPECIFIC_TAX
# ifdef G_OS_WIN32
gchar *thislocale = g_win32_getlocale();
gboolean is_de_DE = (strncmp(thislocale, "de_DE", 5) == 0);
@ -63,8 +60,6 @@ libgncmod_tax_us_gnc_module_path(void)
return g_strdup("gnucash/tax/de_DE");
else
return g_strdup("gnucash/tax/us");
#endif /* LOCALE_SPECIFIC_TAX */
return g_strdup("gnucash/tax/us");
}
char *
@ -86,8 +81,7 @@ libgncmod_tax_us_gnc_module_init(int refcount)
{
/* This is a very simple hack that loads the (new, special) German
tax definition file in a German locale, or (default) loads the
previous US tax file. */
#ifdef LOCALE_SPECIFIC_TAX
US tax file. */
# ifdef G_OS_WIN32
gchar *thislocale = g_win32_getlocale();
gboolean is_de_DE = (strncmp(thislocale, "de_DE", 5) == 0);
@ -99,7 +93,6 @@ libgncmod_tax_us_gnc_module_init(int refcount)
if (is_de_DE)
lmod("(gnucash tax de_DE)");
else
#endif /* LOCALE_SPECIFIC_TAX */
lmod("(gnucash tax us)");
return TRUE;
}