summaryrefslogtreecommitdiff
path: root/lisp/erc/erc-lang.el
diff options
context:
space:
mode:
authorसमीर सिंह Sameer Singh <lumarzeli30@gmail.com>2022-05-19 01:08:14 +0530
committerEli Zaretskii <eliz@gnu.org>2022-05-19 15:23:46 +0300
commitcfd7edb5a9048324ab2a714365ef155efd918cb0 (patch)
tree6b60af0ac6f731c92487577fc8f591e5addc05c5 /lisp/erc/erc-lang.el
parentc15430997679fced7ef6adc23cbc59d0cfa3d625 (diff)
downloademacs-cfd7edb5a9048324ab2a714365ef155efd918cb0.tar.gz
Rename Oriya to Odia, and more
Due to "The Orissa (Alteration of Name) Act, 2011" (https://legislative.gov.in/sites/default/files/A2011-15.pdf) Oriya has been renamed to Odia. * lisp/language/indian.el (set-language-info-alist): Rename Oriya to Odia. Improve Oriya composition rules. * lisp/leim/quail/indian.el ("odia"): New input method. * lisp/erc/erc-lang.el: Obsolete the iso-638-languages variable (which was a typo) and replace it with iso-639-1-languages. * etc/HELLO: Rename Oriya to Odia. Replace the old Odia greeting with the new one. Add a Hindi greeting separate from the Devanagari one. (Bug#55493)
Diffstat (limited to 'lisp/erc/erc-lang.el')
-rw-r--r--lisp/erc/erc-lang.el12
1 files changed, 5 insertions, 7 deletions
diff --git a/lisp/erc/erc-lang.el b/lisp/erc/erc-lang.el
index b65f4dbf6ac..d059caf5a32 100644
--- a/lisp/erc/erc-lang.el
+++ b/lisp/erc/erc-lang.el
@@ -32,10 +32,8 @@
(require 'erc)
-;; FIXME: It's ISO 639-1, not ISO 638. ISO 638 is for paper, board and pulps.
-;; The Lisp variable should be renamed.
-
-(defvar iso-638-languages
+(define-obsolete-variable-alias 'iso-638-languages 'iso-639-1-languages "29.1")
+(defvar iso-639-1-languages
'(("aa" . "Afar")
("ab" . "Abkhazian")
("af" . "Afrikaans")
@@ -197,12 +195,12 @@ Normungsinstitut (ON), Postfach 130, A-1021 Vienna, Austria.")
(defun language (code)
"Return the language name for the ISO CODE."
(interactive (list (completing-read "ISO language code: "
- iso-638-languages)))
- (message "%s" (cdr (assoc code iso-638-languages))))
+ iso-639-1-languages)))
+ (message "%s" (cdr (assoc code iso-639-1-languages))))
(defun erc-cmd-LANG (language)
"Display the language name for the language code given by LANGUAGE."
- (let ((lang (cdr (assoc language iso-638-languages))))
+ (let ((lang (cdr (assoc language iso-639-1-languages))))
(erc-display-message
nil 'notice 'active
(or lang (concat language ": No such domain"))))