Skip to content

fix Issue#887 ivorysql-wasm meson build error #914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gaoxueyu merged 1 commit into from
Oct 13, 2025
Merged

fix Issue#887 ivorysql-wasm meson build error #914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion meson_options.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ option('systemd', type: 'feature', value: 'auto',
description: 'systemd support')

option('uuid', type: 'combo', choices: ['none', 'bsd', 'e2fs', 'ossp'],
value: 'ossp',
value: 'e2fs',
description: 'Use LIB for contrib/uuid-ossp support')

option('zlib', type: 'feature', value: 'auto',
Expand Down
7 changes: 2 additions & 5 deletions src/bin/initdb/po/zh_CN.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,11 +776,8 @@ msgstr "\"%s\" 是用于 \"%s\" 连接的无效认证方法"

#: initdb.c:2521
#, c-format
msgid " NOTICE: If you set this to gb18030,\n\
the database will initilized with gb18030_2000,but not gb18030_2022,\n\
if you want to use gb18030_2022,please set this option to gb18030_2022,\n"
msgstr " 注意: 如果设置了这个参数为gb18030,数据库会以gb18030_2000标准进行初始化,\n\
如果想要使用gb18030_2022标准,将此选项设置为gb18030_2022\n"
msgid "NOTICE: If you set this to gb18030, the database will initilized with gb18030_2000,but not gb18030_2022, if you want to use gb18030_2022,please set this option to gb18030_2022,\n"
Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai bot Oct 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Fix typo and spacing issues in the source message.

The msgid string contains several issues:

  1. Typo: "initilized" should be "initialized"
  2. Missing spaces: "gb18030_2000,but" → "gb18030_2000, but"
  3. Missing spaces: "gb18030_2022,please" → "gb18030_2022, please"

These issues should be corrected in the source C code (initdb.c:2521), and then the translation file should be regenerated to reflect the corrected source text.

Apply this diff to fix the English message:

-msgid "NOTICE: If you set this to gb18030, the database will initilized with gb18030_2000,but not gb18030_2022, if you want to use gb18030_2022,please set this option to gb18030_2022,\n"
+msgid "NOTICE: If you set this to gb18030, the database will be initialized with gb18030_2000, but not gb18030_2022. If you want to use gb18030_2022, please set this option to gb18030_2022.\n"

Note: The corresponding changes should first be made in initdb.c at line 2521, then regenerate the .po file using the appropriate translation tools.

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
msgid "NOTICE: If you set this to gb18030, the database will initilized with gb18030_2000,but not gb18030_2022, if you want to use gb18030_2022,please set this option to gb18030_2022,\n"
msgid "NOTICE: If you set this to gb18030, the database will be initialized with gb18030_2000, but not gb18030_2022. If you want to use gb18030_2022, please set this option to gb18030_2022.\n"
🤖 Prompt for AI Agents 
In src/bin/initdb/po/zh_CN.po around line 779 the msgid contains typos and
spacing errors that need to match the corrected source string in initdb.c:2521;
update initdb.c line 2521 to change "initilized" to "initialized", and add
spaces after commas so the English source becomes: 'NOTICE: If you set this to
gb18030, the database will initialized with gb18030_2000, but not gb18030_2022,
if you want to use gb18030_2022, please set this option to gb18030_2022,\n' then
regenerate the .po files using the project’s translation extraction tools (e.g.,
xgettext/intltool) so the zh_CN.po reflects the corrected source string.

msgstr "注意: 如果设置了这个参数为gb18030, 数据库会以gb18030_2000标准进行初始化, 如果想要使用gb18030_2022标准,将此选项设置为gb18030_2022\n"

#: initdb.c:2531
#, c-format
Expand Down