[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master cfd7edb5a9 1/2: Rename Oriya to Odia, and more
|
From: |
Eli Zaretskii |
|
Subject: |
master cfd7edb5a9 1/2: Rename Oriya to Odia, and more |
|
Date: |
Thu, 19 May 2022 08:29:49 -0400 (EDT) |
branch: master
commit cfd7edb5a9048324ab2a714365ef155efd918cb0
Author: समीर सिंह Sameer Singh <lumarzeli30@gmail.com>
Commit: Eli Zaretskii <eliz@gnu.org>
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)
---
etc/HELLO | 5 +-
lisp/erc/erc-lang.el | 12 ++---
lisp/language/indian.el | 19 ++++----
lisp/leim/quail/indian.el | 116 ++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 134 insertions(+), 18 deletions(-)
diff --git a/etc/HELLO b/etc/HELLO
index ba7bd8e132..bcaedd80b2 100644
--- a/etc/HELLO
+++ b/etc/HELLO
@@ -11,7 +11,7 @@ Non-ASCII examples:
Cześć!,</x-charset><x-charset><param>latin-iso8859-2</param> Dobrý
den,</x-charset><x-charset><param>cyrillic-iso8859-5</param>
Здравствуйте!,</x-charset><x-charset><param>greek-iso8859-7</param> Γειά
σας,</x-charset> გამარჯობა
Africa: <x-charset><param>ethiopic</param>ሠላም</x-charset>
Middle/Near East:<x-charset><param>hebrew-iso8859-8</param>
שָׁלוֹם,</x-charset> السّلام عليكم
- South Asia: નમસ્તે, नमस्ते, ನಮಸ್ಕಾರ, നമസ്കാരം, ଶୁଣିବେ,
+ South Asia: નમસ્તે, नमस्ते, ನಮಸ್ಕಾರ, നമസ്കാരം, ନମସ୍କାର,
ආයුබෝවන්, வணக்கம், నమస్కారం,<x-charset><param>tibetan</param>
བཀྲ་ཤིས་བདེ་ལེགས༎</x-charset>
South East Asia: ជំរាបសួរ,<x-charset><param>lao</param> ສະບາຍດີ,</x-charset>
မင်္ဂလာပါ,<x-charset><param>thai-tis620</param>
สวัสดีครับ,</x-charset><x-charset><param>vietnamese-viscii-lower</param>
</x-charset><x-charset><param>vietnamese-viscii-upper</param>C</x-charset><x-charset><param>vietnamese-viscii-lower</param>hào
bạn</x-charset>
East Asia:<x-charset><param>chinese-gb2312</param>
你好,</x-charset><x-charset><param>chinese-big5-1</param>
早晨,</x-charset><x-charset><param>japanese-jisx0208</param>
こんにちは,</x-charset><x-charset><param>korean-ksc5601</param> 안녕하세요</x-charset>
@@ -56,6 +56,7 @@ Greek, ancient (ἑλληνική) Οὖλέ τε καὶ μέγα χαῖρε
Gujarati (ગુજરાતી) નમસ્તે
Gurmukhi (ਗੁਰਮੁਖੀ) ਸਤ ਸ੍ਰੀ ਅਕਾਲ
Hebrew (עִבְרִית) שָׁלוֹם
+Hindi (हिन्दी) प्रणाम / पाय लागू
Hungarian (magyar) Szép jó napot!
Inuktitut (ᐃᓄᒃᑎᑐᑦ) ᐊᐃ
Italian (italiano) Ciao / Buon giorno
@@ -74,7 +75,7 @@ Modi (𑘦𑘻𑘚𑘲) 𑘡𑘦𑘭𑘿𑘎𑘰𑘨
Mongolian (монгол хэл) Сайн байна уу?
Northern Thai (ᨣᩣᩴᨾᩮᩬᩥᨦ / ᨽᩣᩈᩣᩃ᩶ᩣ᩠ᨶᨶᩣ) ᩈ᩠ᩅᩢᩔ᩠ᨯᩦᨣᩕᩢ᩠ᨸ
Norwegian (norsk) Hei / God dag
-Oriya (ଓଡ଼ିଆ) ନମସ୍କାର
+Odia (ଓଡ଼ିଆ) ନମସ୍କାର
Polish (język polski) Dzień dobry! / Cześć!
Russian (русский) Здра́вствуйте!
Sharada (𑆯𑆳𑆫𑆢𑆳) 𑆤𑆩𑆱𑇀𑆑𑆳𑆫
diff --git a/lisp/erc/erc-lang.el b/lisp/erc/erc-lang.el
index b65f4dbf6a..d059caf5a3 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"))))
diff --git a/lisp/language/indian.el b/lisp/language/indian.el
index 257ecc1617..fccf3c0c0a 100644
--- a/lisp/language/indian.el
+++ b/lisp/language/indian.el
@@ -83,14 +83,15 @@ North Indian language Gujarati is supported in this
language environment."))
'("Indian"))
(set-language-info-alist
- "Oriya" '((charset unicode)
- (coding-system utf-8)
- (coding-priority utf-8)
- (input-method . "oriya-itrans")
- (sample-text . "Oriya (ଓଡ଼ିଆ) ନମସ୍କାର")
- (documentation . "\
-Such languages using Oriya script as Oriya, Khonti, and Santali
-are supported in this language environment."))
+ "Odia" '((charset unicode)
+ (coding-system utf-8)
+ (coding-priority utf-8)
+ (input-method . "odia")
+ (sample-text . "Odia (ଓଡ଼ିଆ) ନମସ୍କାର")
+ (documentation . "\
+Such languages using the Odia script as Odia, Khonti, and Santali
+are supported in this language environment (formerly the Oriya
+language environment)."))
'("Indian"))
(set-language-info-alist
@@ -339,7 +340,7 @@ in this language environment."))
'(("a" . "\u0B01") ; SIGN CANDRABINDU
("A" . "[\u0B02\u0B03]") ; SIGN ANUSVARA .. VISARGA
("V" . "[\u0B05-\u0B14\u0B60\u0B61]") ; independent vowel
- ("C" . "[\u0B15-\u0B39\u0B5C\u0B5D\u0B71]") ; consonant
+ ("C" . "[\u0B15-\u0B39\u0B5C\u0B5D\u0B5F\u0B71]") ; consonant
("B" .
"[\u0B15-\u0B17\u0B1B-\u0B1D\u0B1F-\u0B21\u0B23\u0B24\u0B27-\u0B30\u0B32-\u0B35\u0B38\u0B39]")
; consonant with below form
("R" . "\u0B30") ; RA
("n" . "\u0B3C") ; NUKTA
diff --git a/lisp/leim/quail/indian.el b/lisp/leim/quail/indian.el
index 95798a4477..b76cf9a80d 100644
--- a/lisp/leim/quail/indian.el
+++ b/lisp/leim/quail/indian.el
@@ -1449,4 +1449,120 @@ Full key sequences are listed below:")
("M" ?𑘽)
)
+(quail-define-package
+ "odia" "Odia" "ଓ" t "Odia phonetic input method.
+
+ `\\=`' is used to switch levels instead of Alt-Gr.
+" nil t t t t nil nil nil nil nil t)
+
+(quail-define-rules
+("``" ?₹)
+("1" ?୧)
+("`1" ?1)
+("`!" ?୲)
+("2" ?୨)
+("`2" ?2)
+("`@" ?୳)
+("3" ?୩)
+("`3" ?3)
+("`#" ?୴)
+("4" ?୪)
+("`4" ?4)
+("`$" ?୵)
+("5" ?୫)
+("`5" ?5)
+("`%" ?୶)
+("6" ?୬)
+("`6" ?6)
+("`^" ?୷)
+("7" ?୭)
+("`7" ?7)
+("8" ?୮)
+("`8" ?8)
+("9" ?୯)
+("`9" ?9)
+("0" ?୦)
+("`0" ?0)
+("`\\" ?।)
+("`|" ?॥)
+("`" ?ଟ)
+("q" ?ଟ)
+("Q" ?ଠ)
+("`q" ?୰)
+("`Q" ?୕)
+("w" ?ଡ)
+("W" ?ଢ)
+("`w" ?ଡ଼)
+("`W" ?ଢ଼)
+("e" ?େ)
+("E" ?ୈ)
+("`e" ?ଏ)
+("`E" ?ଐ)
+("r" ?ର)
+("R" ?ୃ)
+("`r" ?ଋ)
+("t" ?ତ)
+("T" ?ଥ)
+("`t" ?ୖ)
+("`T" ?ୗ)
+("y" ?ଯ)
+("Y" ?ୟ)
+("u" ?ୁ)
+("U" ?ୂ)
+("`u" ?ଉ)
+("`U" ?ଊ)
+("i" ?ି)
+("I" ?ୀ)
+("`i" ?ଇ)
+("`I" ?ଈ)
+("o" ?ୋ)
+("O" ?ୌ)
+("`o" ?ଓ)
+("`O" ?ଔ)
+("p" ?ପ)
+("P" ?ଫ)
+("a" ?ା)
+("A" ?ଆ)
+("`a" ?ଅ)
+("s" ?ସ)
+("S" ?ଶ)
+("d" ?ଦ)
+("D" ?ଧ)
+("f" ?୍)
+("F" ?ୄ)
+("`f" ?ୠ)
+("g" ?ଗ)
+("G" ?ଘ)
+("h" ?ହ)
+("H" ?ଃ)
+("j" ?ଜ)
+("J" ?ଝ)
+("k" ?କ)
+("K" ?ଖ)
+("l" ?ଲ)
+("L" ?ଳ)
+("`l" ?ୢ)
+("`L" ?ଌ)
+("z" ?ଞ)
+("Z" ?ଙ)
+("`z" ?ୣ)
+("`Z" ?ୡ)
+("x" ?ଷ)
+("X" ?଼)
+("c" ?ଚ)
+("C" ?ଛ)
+("`c" #x200C) ; ZWNJ
+("`C" #x200D) ; ZWJ
+("v" ?ଵ)
+("V" ?ୱ)
+("b" ?ବ)
+("B" ?ଭ)
+("n" ?ନ)
+("N" ?ଣ)
+("m" ?ମ)
+("M" ?ଂ)
+("`m" ?ଁ)
+("`M" ?ଽ)
+)
+
;;; indian.el ends here