fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2026-05-07 18:58:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'i18n-fixes' into 'main'

Browse source 
Fix translations after meson conversion

See merge request plymouth/plymouth!240
This commit is contained in:
Ray Strode 2023-08-16 22:00:46 +00:00
commit e70c0fb49e
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libply/ply-i18n.h
View file

@ -17,11 +17,7 @@
#ifndef PLY_I18N_H
#define PLY_I18N_H
#ifdef ENABLE_NLS
#include <libintl.h>
#define _(String) dgettext (PACKAGE, String)
#else
#define _(String) (String)
#endif
#define _(String) dgettext ("plymouth", String)
#endif /* PLY_I18N_H */

2
src/main.c
View file

@ -2240,7 +2240,7 @@ main (int argc,
state.loop = ply_event_loop_get_default ();
/* Initialize the translations if they are available (!initrd) */
if (ply_directory_exists (PLYMOUTH_LOCALE_DIRECTORY))
if (ply_file_exists (PLYMOUTH_LOCALE_DIRECTORY "/nl/LC_MESSAGES/plymouth.mo"))
setlocale (LC_ALL, "");
ply_command_parser_add_options (state.command_parser,

4
src/meson.build
View file

@ -22,8 +22,8 @@ plymouthd_deps = [
]
plymouthd_cflags = [
'-DPLYMOUTH_LOCALE_DIRECTORY="@0@"'.format(get_option('localedir')),
'-DPLYMOUTH_DRM_ESCROW_DIRECTORY="@0@"'.format(get_option('libexecdir') / 'plymouth'),
'-DPLYMOUTH_LOCALE_DIRECTORY="@0@"'.format(get_option('prefix') / get_option('localedir')),
'-DPLYMOUTH_DRM_ESCROW_DIRECTORY="@0@"'.format(get_option('prefix') / get_option('libexecdir') / 'plymouth'),
'-DPLYMOUTH_LOG_DIRECTORY="@0@"'.format('/var/log'),
'-DPLYMOUTH_SPOOL_DIRECTORY="@0@"'.format(plymouthd_spool_dir),
]