Translation: Drop deprecated language links (#1643)

Support for full-name languages has been deprecated since
Squid-3.1 it is long overdue to remove these symlinks and
simplify the default install footprint.

diff --git a/doc/release-notes/release-7.sgml.in b/doc/release-notes/release-7.sgml.in
index 30b24de2072afa673634708d05a2ff6f1a40bfd8..927118c630564e28ba5567badc7c56cc45c1aabe 100644 (file)
--- a/doc/release-notes/release-7.sgml.in
+++ b/doc/release-notes/release-7.sgml.in
@@ -32,6 +32,7 @@ The Squid-@SQUID_RELEASE@ change history can be <url url="https://github.com/squ
 <itemize>
        <item>Cache Manager changes
        <item>Removed purge tool
+       <item>Remove deprecated languages
 </itemize>
 
 <p>Most user-facing changes are reflected in squid.conf (see further below).
@@ -82,6 +83,26 @@ The Squid-@SQUID_RELEASE@ change history can be <url url="https://github.com/squ
 </verb>
    Alternatively the HTCP <em>CLR</em> mechanism can be used.
 
+<sect1>Removed deprecated languages
+<p>Old Squid used full language name to refer to error page translations.
+   These have been deprecated since addition of ISO-639 language codes
+   and support for HTTP Accept-Language negotiation in Squid-3.x.
+
+<p>As of this release Squid will no longer provide the symlinks
+   needed for seamless upgrade for squid.conf containing settings such as
+<verb>
+    error_directory English
+</verb>
+   All Squid installations are expected to already have them,
+   or to convert to the ISO-639 equivalents. Existing symlinks are not
+   affected.
+
+<p>See <url url="http://www.squid-cache.org/Versions/langpack/"> for the latest
+   list of official Squid translations.
+
+<p>See <url url="https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes"> for
+   the full ISO-639 list. HTTP uses the 2-letter (set 1) codes.
+
 
 <sect>Changes to squid.conf since Squid-@SQUID_RELEASE_OLD@
 <p>

diff --git a/errors/Makefile.am b/errors/Makefile.am
index 38b412303015b9b068117b76f38b0754390a914f..843104c74105d1d14f91347245ee017d5a795ba5 100644 (file)
--- a/errors/Makefile.am
+++ b/errors/Makefile.am
@@ -28,7 +28,7 @@ EXTRA_DIST = \
        templates/error-details.txt \
        language.am \
        template.am \
-       aliases alias-link.sh alias-upgrade errorpage.css TRANSLATORS COPYRIGHT
+       aliases alias-link.sh errorpage.css TRANSLATORS COPYRIGHT
 
 if ENABLE_TRANSLATION
 ALIAS_LINKER=$(SHELL) $(srcdir)/alias-link.sh "$(LN)" "$(RM)" "$(DESTDIR)$(DEFAULT_ERROR_DIR)"
@@ -126,10 +126,6 @@ uninstall-local:
        rm -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/TRANSLATORS
        rm -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/COPYRIGHT
 
-## Upgrade requires the new files to be pre-installed
-upgrade: install
-       $(ALIAS_LINKER) "$(srcdir)/alias-upgrade" || exit 1 ;
-
 dist-hook: translate
        for lang in $(TRANSLATE_LANGUAGES); do \
          lang=`basename $$lang .lang`; \

diff --git a/errors/alias-upgrade b/errors/alias-upgrade
deleted file mode 100644 (file)
index 553e3c3..0000000
--- a/errors/alias-upgrade
+++ /dev/null
@@ -1,40 +0,0 @@
-## Copyright (C) 1996-2023 The Squid Software Foundation and contributors
-##
-## Squid software is distributed under GPLv2+ license and includes
-## contributions from numerous individuals and organizations.
-## Please see the COPYING and CONTRIBUTORS files for details.
-##
-
-# 3.0 Still published with the old language namings.
-# we leave these alone in case any are configured...
-az     Azerbaijani
-bg     Bulgarian
-ca     Catalan
-cs     Czech
-da     Danish
-de     German
-el     Greek
-en     English
-es     Spanish
-et     Estonian
-fi     Finnish
-fr     French
-he     Hebrew
-hu     Hungarian
-hy     Armenian
-it     Italian
-ja     Japanese
-ko     Korean
-lt     Lithuanian
-nl     Dutch
-pl     Polish
-pt     Portuguese
-ro     Romanian
-ru     Russian-1251 Russian-koi8-r
-sk     Slovak
-sr-latn        Serbian
-sv     Swedish
-tr     Turkish
-uk     Ukrainian-1251 Ukrainian-koi8-u Ukrainian-utf8
-zh-cn  Simplify_Chinese
-zh-tw  Traditional_Chinese