From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 23 Jul 2018 03:10:14 +0000 (+0200)
Subject: patch 8.1.0207: need many menu translation files to cover regions
X-Git-Tag: v8.1.0207
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=68f1b1b37fa7aba985d9f8727fd9f0f3eb0c19a9;p=vim

patch 8.1.0207: need many menu translation files to cover regions

Problem:    Need many menu translation files to cover regions.
Solution:   When there is no region match, try without. (Christian Brabandt)
---

diff --git a/runtime/menu.vim b/runtime/menu.vim
index b9bd3d89c..b4c59dd92 100644
--- a/runtime/menu.vim
+++ b/runtime/menu.vim
@@ -56,6 +56,13 @@ if exists("v:lang") || &langmenu != ""
       let s:lang = substitute(s:lang, '\.[^.]*', "", "")
       exe "runtime! lang/menu_" . s:lang . "[^a-z]*vim"
 
+      if !exists("did_menu_trans") && s:lang =~ '_'
+	" If the language includes a region try matching without that region.
+	" (e.g. find menu_de.vim if s:lang == de_DE).
+	let langonly = substitute(s:lang, '_.*', "", "")
+	exe "runtime! lang/menu_" . langonly . "[^a-z]*vim"
+      endif
+
       if !exists("did_menu_trans") && strlen($LANG) > 1 && s:lang !~ '^en_us'
 	" On windows locale names are complicated, try using $LANG, it might
 	" have been set by set_init_1().  But don't do this for "en" or "en_us".
diff --git a/src/version.c b/src/version.c
index 36e2fcbc4..39ea6e2ab 100644
--- a/src/version.c
+++ b/src/version.c
@@ -793,6 +793,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    207,
 /**/
     206,
 /**/