pidgin/pidgin

Change the logic for determining whether or not to install translations

2020-06-11, Gary Kramlich
25f653ee017e
Parents 1705e375aeb9
Children 24ed25d87550e823c28f6668
Change the logic for determining whether or not to install translations
3 files changed, 11 insertions(+), 16 deletions(-)
  • +3 -14
    meson.build
  • +2 -1
    pidgin/meson.build
  • +6 -1
    po/meson.build
    • --- a/meson.build Thu Jun 11 22:11:47 2020 -0500
    +++ b/meson.build Thu Jun 11 22:33:42 2020 -0500
    @@ -270,18 +270,6 @@
    endif
    # #######################################################################
    -# # Disable creation and installation of translation files
    -# #######################################################################
    -
    -INSTALL_I18N = get_option('nls')
    -
    -if INSTALL_I18N
    - i18n = import('i18n')
    -
    - subdir('po')
    -endif
    -
    -# #######################################################################
    # # Check for GLib 2.44 (required)
    # #######################################################################
    glib = dependency('glib-2.0', version : '>= 2.48.0')
    @@ -792,6 +780,7 @@
    subdir('finch')
    subdir('pidgin')
    subdir('doc')
    +subdir('po')
    configure_file(output : 'config.h',
    configuration : conf)
    @@ -816,7 +805,7 @@
    message('Use kerberos 4 with zephyr.... : ' + kerberos.to_string())
    endif
    message('Install pixmaps............... : ' + INSTALL_PIXMAPS.to_string())
    -message('Install translations.......... : ' + INSTALL_I18N.to_string())
    +message('Install translations.......... : ' + get_option('nls').to_string())
    message('Has you....................... : yes')
    message('')
    message('Build Unity integration plugin.: ' + enable_unity.to_string())
    @@ -840,7 +829,7 @@
    message('Warning: You have disabled the installation of pixmap data, but Pidgin')
    message('still requires installed pixmaps. Be sure you know what you are doing.')
    endif
    -if not INSTALL_I18N
    +if not get_option('nls')
    message('')
    message('Warning: You have disabled the building and installation of translation')
    message('data. This will prevent building Pidgin desktop files.')
    --- a/pidgin/meson.build Thu Jun 11 22:11:47 2020 -0500
    +++ b/pidgin/meson.build Thu Jun 11 22:33:42 2020 -0500
    @@ -215,7 +215,8 @@
    requires : ['gtk+-3.0', 'purple-3', 'talkatu', 'gplugin-gtk'],
    variables : ['plugindir=${libdir}/pidgin-@0@'.format(purple_major_version)])
    - if INSTALL_I18N
    + if get_option('nls')
    + i18n = import('i18n')
    DESKTOP_FILE = 'im.pidgin.Pidgin3.desktop'
    desktop_file_in = configure_file(
    input : 'data/' + DESKTOP_FILE + '.in.in',
    --- a/po/meson.build Thu Jun 11 22:11:47 2020 -0500
    +++ b/po/meson.build Thu Jun 11 22:33:42 2020 -0500
    @@ -1,1 +1,6 @@
    -i18n.gettext('pidgin', args : '--from-code=utf-8')
    +i18n = import('i18n')
    +
    +i18n.gettext('pidgin',
    + args : '--from-code=utf-8',
    + install : get_option('nls'),
    +)