1
0
mirror of https://github.com/weechat/weechat.git synced 2026-06-13 22:54:47 +02:00

Compare commits

..

2 Commits

Author SHA1 Message Date
Sébastien Helleu e050eebb2e api: return input string in function string_iconv_from_internal when current locale is wrong
This fixes a bug when writing configuration files with a wrong locale: now
UTF-8 is kept and written in files instead of string converted using a wrong
charset.
2025-03-02 13:46:21 +01:00
Sébastien Helleu e8a7869722 Version 4.5.3-dev 2025-02-20 23:40:51 +01:00
4 changed files with 14 additions and 2 deletions
+6
View File
@@ -1,5 +1,11 @@
# WeeChat ChangeLog
## Version 4.5.3 (under dev)
### Fixed
- core: save configuration files as UTF-8 when the locale is wrong
## Version 4.5.2 (2025-02-20)
### Fixed
+6 -1
View File
@@ -3253,7 +3253,8 @@ string_iconv_to_internal (const char *charset, const char *string)
}
/*
* Converts internal string to terminal charset, for display.
* Converts internal string to terminal charset, for display or write of
* configuration files.
*
* Note: result must be freed after use.
*/
@@ -3270,6 +3271,10 @@ string_iconv_from_internal (const char *charset, const char *string)
if (!input)
return NULL;
/* if the locale is wrong, we keep UTF-8 */
if (!weechat_locale_ok)
return input;
/*
* optimized for UTF-8: if charset is NULL => we use term charset => if
* this charset is already UTF-8, then no iconv is needed
+1
View File
@@ -118,6 +118,7 @@ extern char *weechat_data_dir;
extern char *weechat_state_dir;
extern char *weechat_cache_dir;
extern char *weechat_runtime_dir;
extern int weechat_locale_ok;
extern char *weechat_local_charset;
extern int weechat_plugin_no_dlclose;
extern int weechat_no_gnutls;
+1 -1
View File
@@ -40,7 +40,7 @@
#
weechat_stable="4.5.2"
weechat_devel="4.5.2"
weechat_devel="4.5.3-dev"
stable_major=$(echo "${weechat_stable}" | cut -d"." -f1)
stable_minor=$(echo "${weechat_stable}" | cut -d"." -f2)