[vlc-devel] [vlc-commits] l10n: enabling Khmer

[Konstantin Pavlov]

Hello,

On Sat, Apr 04, 2020 at 04:58:54PM +0000, Michał Trzebiatowski wrote:
> vlc/vlc-3.0 | branch: master | Michał Trzebiatowski <michtrz at gmail.com> | Fri Mar 27 21:53:30 2020 +0100| [242441abaf5619f0a23b677952398f794a6ddeac] | committer: David Fuhrmann
> 
> l10n: enabling Khmer
> 
> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=242441abaf5619f0a23b677952398f794a6ddeac
> ---
> 
>  extras/package/win32/NSIS/vlc.win32.nsi.in | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/extras/package/win32/NSIS/vlc.win32.nsi.in b/extras/package/win32/NSIS/vlc.win32.nsi.in
> index b1397c6956..05273207ca 100644
> --- a/extras/package/win32/NSIS/vlc.win32.nsi.in
> +++ b/extras/package/win32/NSIS/vlc.win32.nsi.in
> @@ -231,6 +231,8 @@ RequestExecutionLevel admin
>    !insertmacro LANGFILE_INCLUDE_WITHDEFAULT "AsturianExtra.nsh" ${VLC_LANGFILE_FALLBACK}
>    !insertmacro MUI_LANGUAGE "Corsican"
>    !insertmacro LANGFILE_INCLUDE_WITHDEFAULT "CorsicanExtra.nsh" ${VLC_LANGFILE_FALLBACK}
> +  !insertmacro MUI_LANGUAGE "Khmer"
> +  !insertmacro LANGFILE_INCLUDE_WITHDEFAULT "KhmerExtra.nsh" ${VLC_LANGFILE_FALLBACK}

I think this should be reverted, since Khmer is not shipped by default in
NSIS releases, which causes installer builds to fail:

Error: Can't open language file - "/usr/share/nsis\Contrib\Language
files\Khmer.nlf"!
Error in macro MUI_LANGUAGEEX on macroline 13
Error in macro MUI_LANGUAGE on macroline 4
Error in script "./vlc-3.0.9/vlc.win32.nsi" on line 234 -- aborting
creation process


I have opened a pull request to enable it and some other languages, but
even if it is merged, we will need to wait until it propagates to at least
debian unstable to use it on our builders.

The PR is at https://github.com/kichik/nsis/pull/11

-- 
VideoLAN, Vice President
www.videolan.org
+7 926 165 45 31
@cryothresh