summaryrefslogtreecommitdiffstats
path: root/net/ipv6
ModeNameSize
-rw-r--r--Kconfig8614logstatsplain
-rw-r--r--Makefile1833logstatsplain
-rw-r--r--addrconf.c176194logstatsplain
-rw-r--r--addrconf_core.c7970logstatsplain
-rw-r--r--addrlabel.c15785logstatsplain
-rw-r--r--af_inet6.c29406logstatsplain
-rw-r--r--ah6.c18271logstatsplain
-rw-r--r--anycast.c13052logstatsplain
-rw-r--r--calipso.c38797logstatsplain
-rw-r--r--datagram.c25338logstatsplain
-rw-r--r--esp6.c21365logstatsplain
-rw-r--r--esp6_offload.c8069logstatsplain
-rw-r--r--exthdrs.c27671logstatsplain
-rw-r--r--exthdrs_core.c7648logstatsplain
-rw-r--r--exthdrs_offload.c711logstatsplain
-rw-r--r--fib6_notifier.c1494logstatsplain
-rw-r--r--fib6_rules.c12219logstatsplain
-rw-r--r--fou6.c5145logstatsplain
-rw-r--r--icmp.c28293logstatsplain
d---------ila222logstatsplain
-rw-r--r--inet6_connection_sock.c4233logstatsplain
-rw-r--r--inet6_hashtables.c8207logstatsplain
-rw-r--r--ip6_checksum.c3558logstatsplain
-rw-r--r--ip6_fib.c60385logstatsplain
-rw-r--r--ip6_flowlabel.c20342logstatsplain
-rw-r--r--ip6_gre.c59054logstatsplain
-rw-r--r--ip6_icmp.c974logstatsplain
-rw-r--r--ip6_input.c14769logstatsplain
-rw-r--r--ip6_offload.c11598logstatsplain
-rw-r--r--ip6_offload.h302logstatsplain
-rw-r--r--ip6_output.c48967logstatsplain
-rw-r--r--ip6_tunnel.c57952logstatsplain
-rw-r--r--ip6_udp_tunnel.c2888logstatsplain
-rw-r--r--ip6_vti.c29787logstatsplain
-rw-r--r--ip6mr.c60201logstatsplain
-rw-r--r--ipcomp6.c4996logstatsplain
-rw-r--r--ipv6_sockglue.c31160logstatsplain
-rw-r--r--mcast.c73150logstatsplain
-rw-r--r--mcast_snoop.c4422logstatsplain
-rw-r--r--mip6.c12565logstatsplain
-rw-r--r--ndisc.c49461logstatsplain
-rw-r--r--netfilter.c6724logstatsplain
d---------netfilter1297logstatsplain
-rw-r--r--output_core.c4393logstatsplain
-rw-r--r--ping.c7272logstatsplain
-rw-r--r--proc.c10550logstatsplain
-rw-r--r--protocol.c1912logstatsplain
-rw-r--r--raw.c32459logstatsplain
-rw-r--r--reassembly.c14438logstatsplain
-rw-r--r--route.c160235logstatsplain
-rw-r--r--seg6.c10015logstatsplain
-rw-r--r--seg6_hmac.c9803logstatsplain
-rw-r--r--seg6_iptunnel.c11700logstatsplain
-rw-r--r--seg6_local.c24150logstatsplain
-rw-r--r--sit.c46788logstatsplain
-rw-r--r--syncookies.c7300logstatsplain
-rw-r--r--sysctl_net_ipv6.c8223logstatsplain
-rw-r--r--tcp_ipv6.c55683logstatsplain
-rw-r--r--tcpv6_offload.c1935logstatsplain
-rw-r--r--tunnel6.c4398logstatsplain
-rw-r--r--udp.c44669logstatsplain
-rw-r--r--udp_impl.h1321logstatsplain
-rw-r--r--udp_offload.c4617logstatsplain
-rw-r--r--udplite.c3091logstatsplain
-rw-r--r--xfrm6_input.c3592logstatsplain
-rw-r--r--xfrm6_output.c4321logstatsplain
-rw-r--r--xfrm6_policy.c6857logstatsplain
-rw-r--r--xfrm6_protocol.c6391logstatsplain
-rw-r--r--xfrm6_state.c1474logstatsplain
-rw-r--r--xfrm6_tunnel.c9898logstatsplain
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-24 16:09:31 +0000
____runtime__defaults.js
# Arguments for xgettext to pick up messages to translate from the source code.
XGETTEXT_KEYWORDS = --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 --keyword=PLURAL_MSG:2,4
diff --git a/src/po/Makefile b/src/po/Makefile
index cc4008fa37..87d657bd90 100644
--- a/src/po/Makefile
+++ b/src/po/Makefile
@@ -1,17 +1,18 @@
# Makefile for the Vim message translations.
+PO_BASEDIR = .
# Include stuff found by configure.
-include ../auto/config.mk
+include $(PO_BASEDIR)/../auto/config.mk
# Get LANGUAGES, MOFILES, MOCONVERTED and others.
-include Make_all.mak
+include $(PO_BASEDIR)/Make_all.mak
# Note: ja.sjis, *.cp1250 and zh_CN.cp936 are only for MS-Windows, they are
# not installed on Unix.
PACKAGE = vim
SHELL = /bin/sh
-VIM = ../vim
+VIM = $(PO_BASEDIR)/../vim
# MacOS sed is locale aware, set $LANG to avoid problems.
SED = LANG=C sed
@@ -261,13 +262,13 @@ PO_INPUTLIST = \
$(PACKAGE).pot: $(PO_INPUTLIST) $(PO_VIM_INPUTLIST)
# Convert the Vim scripts to (what looks like) Javascript.
- $(VIM) -u NONE --not-a-term -S tojavascript.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST)
+ $(VIM) -u NONE --not-a-term -S $(PO_BASEDIR)/tojavascript.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST)
# Create vim.pot.
$(XGETTEXT) --default-domain=$(PACKAGE) --add-comments \
$(XGETTEXT_KEYWORDS) $(PO_INPUTLIST) $(PO_VIM_JSLIST)
mv -f $(PACKAGE).po $(PACKAGE).pot
# Fix Vim scripts names, so that "gf" works.
- $(VIM) -u NONE --not-a-term -S fixfilenames.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST)
+ $(VIM) -u NONE --not-a-term -S $(PO_BASEDIR)/fixfilenames.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST)
# Delete the temporary files.
rm *.js
diff --git a/src/po/fixfilenames.vim b/src/po/fixfilenames.vim
index 04bc0791c0..c92839e556 100644
--- a/src/po/fixfilenames.vim
+++ b/src/po/fixfilenames.vim
@@ -4,7 +4,7 @@
set shortmess+=A
for name in argv()[1:]
- let jsname = fnamemodify(name, ":t:r") .. ".js"
+ let jsname = fnamemodify(name, ":r:gs?\\~?_?:gs?\\.?_?:gs?/?__?:gs?\\?__?") .. ".js"
exe "%s+" .. jsname .. "+" .. substitute(name, '\\', '/', 'g') .. "+"
endfor
diff --git a/src/po/tojavascript.vim b/src/po/tojavascript.vim
index 8b0dd736d5..32eea9b875 100644
--- a/src/po/tojavascript.vim
+++ b/src/po/tojavascript.vim
@@ -13,7 +13,7 @@ for name in argv()[1:]
g/^\s*set .*"/s/.*//
" Write as .js file, xgettext recognizes them
- exe 'w! ' .. fnamemodify(name, ":t:r") .. ".js"
+ exe 'w! ' .. fnamemodify(name, ":r:gs?\\~?_?:gs?\\.?_?:gs?/?__?:gs?\\?__?") .. ".js"
endfor
quit
diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index e31d2b5f3e..a49f158757 100644
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -161,6 +161,9 @@ NEW_TESTS = \
test_function_lists \
test_ga \
test_getcwd \
+ test_gettext \
+ test_gettext_cp1251 \
+ test_gettext_utf8 \
test_getvar \
test_gf \
test_glob2regpat \
@@ -420,6 +423,9 @@ NEW_TESTS_RES = \
test_functions.res \
test_function_lists.res \
test_getcwd.res \
+ test_gettext.res \
+ test_gettext_cp1251.res \
+ test_gettext_utf8.res \
test_getvar.res \
test_gf.res \
test_gn.res \
diff --git a/src/testdir/ru_RU/LC_MESSAGES/__PACKAGE__.mo b/src/testdir/ru_RU/LC_MESSAGES/__PACKAGE__.mo
new file mode 100644
index 0000000000..300eba2137
--- /dev/null
+++ b/src/testdir/ru_RU/LC_MESSAGES/__PACKAGE__.mo
Binary files differ
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index ba8f18fa5a..8e973f6c9e 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -3865,11 +3865,6 @@ func Test_default_arg_value()
call assert_equal('msg', HasDefault())
endfunc
-" Test for gettext()
-func Test_gettext()
- call assert_fails('call gettext(1)', 'E1174:')
-endfunc
-
func Test_builtin_check()
call assert_fails('let g:["trim"] = {x -> " " .. x}', 'E704:')
call assert_fails('let g:.trim = {x -> " " .. x}', 'E704:')
diff --git a/src/testdir/test_gettext.vim b/src/testdir/test_gettext.vim
new file mode 100644
index 0000000000..6a5aafdfe2
--- /dev/null
+++ b/src/testdir/test_gettext.vim
@@ -0,0 +1,16 @@
+source check.vim
+
+" Test for gettext()
+func Test_gettext()
+ call assert_fails('call bindtextdomain("test")', 'E119:')
+ call assert_fails('call bindtextdomain("vim", "test")', 'E475:')
+
+ call assert_fails('call gettext(1)', 'E1174:')
+ call assert_equal('xxxTESTxxx', gettext("xxxTESTxxx"))
+
+ call assert_equal('xxxTESTxxx', gettext("xxxTESTxxx", "vim"))
+ call assert_equal('xxxTESTxxx', gettext("xxxTESTxxx", "__PACKAGE__"))
+ call assert_equal('ERROR: ', gettext("ERROR: ", "__PACKAGE__"))
+endfunc
+
+" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_gettext_cp1251.vim b/src/testdir/test_gettext_cp1251.vim
new file mode 100644
index 0000000000..fe02a03fc5
--- /dev/null
+++ b/src/testdir/test_gettext_cp1251.vim
@@ -0,0 +1,22 @@
+source check.vim
+
+" Test for gettext()
+func Test_gettext()
+ set encoding=cp1251
+ call bindtextdomain("__PACKAGE__", getcwd())
+ try
+ language ru_RU
+ call assert_equal(': ', gettext("ERROR: ", "__PACKAGE__"))
+ catch /^Vim\%((\a\+)\)\=:E197:/
+ throw "Skipped: not possible to set locale to ru (missing?)"
+ endtry
+ try
+ language en_GB.UTF-8
+ call assert_equal('ERROR: ', gettext("ERROR: ", "__PACKAGE__"))
+ catch /^Vim\%((\a\+)\)\=:E197:/
+ throw "Skipped: not possible to set locale to en (missing?)"
+ endtry
+ set encoding&
+endfunc
+
+" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_gettext_utf8.vim b/src/testdir/test_gettext_utf8.vim
new file mode 100644
index 0000000000..277710e14d
--- /dev/null
+++ b/src/testdir/test_gettext_utf8.vim
@@ -0,0 +1,22 @@
+source check.vim
+
+" Test for gettext()
+func Test_gettext()
+ set encoding=utf-8
+ call bindtextdomain("__PACKAGE__", getcwd())
+ try
+ language ru_RU
+ call assert_equal('ОШИБКА: ', gettext("ERROR: ", "__PACKAGE__"))
+ catch /^Vim\%((\a\+)\)\=:E197:/
+ throw "Skipped: not possible to set locale to ru (missing?)"
+ endtry
+ try
+ language en_GB.UTF-8
+ call assert_equal('ERROR: ', gettext("ERROR: ", "__PACKAGE__"))
+ catch /^Vim\%((\a\+)\)\=:E197:/
+ throw "Skipped: not possible to set locale to en (missing?)"
+ endtry
+ set encoding&
+endfunc
+
+" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index f9c298346f..5f9f2b09a9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 509,
+/**/
508,
/**/
507,
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-24 16:09:31 +0000