fixes Bug #281 'in src/manual.c URL for manuals and FAQ wrong'

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 76f8c62ac60ea96371e7d61eb095bf443eb9cfa8..ceb05605bb227b837f0c9d9230a1adf42903f5fd 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,14 @@
+2003-08-19 [paul]      0.9.4claws31
+
+       * src/common/defs.h
+               add the missing '/' to SYLDOC_MANUAL_HTML_INDEX and
+               SYLDOC_FAQ_HTML_INDEX.
+       * src/manual.c
+               use LC_MESSAGES instead of LC_ALL to find the current
+               language
+
+         fixes Bug #281 'in src/manual.c URL for manuals and FAQ wrong'.
+

 2003-08-19 [paul]      0.9.4claws30
 
        * po/bg.po
 2003-08-19 [paul]      0.9.4claws30
 
        * po/bg.po

diff --git a/configure.ac b/configure.ac
index c82e5faf7abdeb84d22f10a07a942ad5f8b671a1..a09f944ed480edc40776ae2d92e56da34e8b648f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=30
+EXTRA_VERSION=31

 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/common/defs.h b/src/common/defs.h
index 08143023b55ec319d7d81e4d8d12991ccfbbec0a..5e24b3b85a47e1113f6731fd12d7e7a165824465 100644 (file)
--- a/src/common/defs.h
+++ b/src/common/defs.h
@@ -67,8 +67,8 @@
 #define FAQ_HTML_INDEX         "sylpheed-faq.html"
 #define HOMEPAGE_URI           "http://claws.sylpheed.org/"
 #define SYLDOC_URI             "http://sylpheeddoc.sourceforge.net/"
 #define FAQ_HTML_INDEX         "sylpheed-faq.html"
 #define HOMEPAGE_URI           "http://claws.sylpheed.org/"
 #define SYLDOC_URI             "http://sylpheeddoc.sourceforge.net/"

-#define SYLDOC_MANUAL_HTML_INDEX "manual/manual.html"
-#define SYLDOC_FAQ_HTML_INDEX  "faq/faq.html"
+#define SYLDOC_MANUAL_HTML_INDEX "/manual/manual.html"
+#define SYLDOC_FAQ_HTML_INDEX  "/faq/faq.html"

 #define CLAWS_FAQ_URI          "http://sylpheed-claws.sourceforge.net/phpwiki/index.php"
 #define CLAWS_BUGZILLA_URI     "http://www.thewildbeast.co.uk/sylpheed-claws/bugzilla/enter_bug.cgi"
 #define FOLDER_LIST            "folderlist.xml"
 #define CLAWS_FAQ_URI          "http://sylpheed-claws.sourceforge.net/phpwiki/index.php"
 #define CLAWS_BUGZILLA_URI     "http://www.thewildbeast.co.uk/sylpheed-claws/bugzilla/enter_bug.cgi"
 #define FOLDER_LIST            "folderlist.xml"

diff --git a/src/manual.c b/src/manual.c
index a1677af46ed31f1ce95648c90a99fc6c70730426..8a3f5e7e6d99487650d695669848dfe36913e927 100644 (file)
--- a/src/manual.c
+++ b/src/manual.c
@@ -44,7 +44,7 @@ static gchar *get_language()
        gchar *language;
        gchar *c;
 
        gchar *language;
        gchar *c;
 

-       language = g_strdup(setlocale(LC_ALL, NULL));
+       language = g_strdup(setlocale(LC_MESSAGES, NULL));

        if((c = strchr(language, ',')) != NULL)
                *c = '\0';
        if((c = strchr(language, '_')) != NULL)
        if((c = strchr(language, ',')) != NULL)
                *c = '\0';
        if((c = strchr(language, '_')) != NULL)