diff --git a/src/libply/ply-i18n.h b/src/libply/ply-i18n.h index 6e4e471b..4d06cb13 100644 --- a/src/libply/ply-i18n.h +++ b/src/libply/ply-i18n.h @@ -17,11 +17,7 @@ #ifndef PLY_I18N_H #define PLY_I18N_H -#ifdef ENABLE_NLS #include -#define _(String) dgettext (PACKAGE, String) -#else -#define _(String) (String) -#endif +#define _(String) dgettext ("plymouth", String) #endif /* PLY_I18N_H */ diff --git a/src/main.c b/src/main.c index 85bababa..d60b42e8 100644 --- a/src/main.c +++ b/src/main.c @@ -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, diff --git a/src/meson.build b/src/meson.build index 13ea0d98..bef3f712 100644 --- a/src/meson.build +++ b/src/meson.build @@ -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), ]