branch: externals/ebdb
commit 6c137637a85115d2d6ccf11d440d0c67f6be7bee
Author: Eric Abrahamsen <[email protected]>
Commit: Eric Abrahamsen <[email protected]>
Don't require ebdb-chn from ebdb-i18n
* ebdb-i18n.el: ebdb-chn is going into a separate package.
* ebdb-chn.el: Instead, require ebdb-i8n from here.
* ebdb-i18n-test.el: Remove dependency on ebdb-chn, and the test that
tested it. Where else can we put that?
---
ebdb-chn.el | 1 +
ebdb-i18n-test.el | 14 --------------
ebdb-i18n.el | 3 ---
3 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/ebdb-chn.el b/ebdb-chn.el
index 3dcfe37..2a8c68e 100644
--- a/ebdb-chn.el
+++ b/ebdb-chn.el
@@ -30,6 +30,7 @@
;;; Code:
(require 'pyim)
+(require 'ebdb-i18n)
(cl-defmethod ebdb-string-i18n ((phone ebdb-field-phone)
(_cc (eql 86)))
diff --git a/ebdb-i18n-test.el b/ebdb-i18n-test.el
index a50f0be..e3b4038 100644
--- a/ebdb-i18n-test.el
+++ b/ebdb-i18n-test.el
@@ -29,7 +29,6 @@
(require 'ert)
(require 'ebdb-i18n)
-(require 'ebdb-chn)
;; Basic name parsing.
@@ -42,19 +41,6 @@
(should (string= (ebdb-name-last max) "von Sydow"))
(should (string= (ebdb-name-last brigitte) "Bardot"))))
-(ert-deftest ebdb-i18n-parse-chinese-name ()
- "Parse names in Chinese.
-
-Uses `ebdb-parse-i18n' method from ebdb-chn.el."
- (let ((two-char (ebdb-parse 'ebdb-field-name-complex "李四"))
- (three-char (ebdb-parse 'ebdb-field-name-complex "张国荣"))
- (compound-surname-1 (ebdb-parse 'ebdb-field-name-complex "司马迁"))
- (compound-surname-2 (ebdb-parse 'ebdb-field-name-complex "慕容学村")))
- (should (string= (ebdb-name-last two-char) "李"))
- (should (string= (ebdb-name-last three-char) "张"))
- (should (string= (ebdb-name-last compound-surname-1) "司马"))
- (should (string= (ebdb-name-last compound-surname-2) "慕容"))))
-
(ert-deftest ebdb-i18n-parse-unhandled-name ()
"Parse a name for which there is no `ebdb-i18n-parse' method
defined.
diff --git a/ebdb-i18n.el b/ebdb-i18n.el
index 85a8324..6261ce8 100644
--- a/ebdb-i18n.el
+++ b/ebdb-i18n.el
@@ -43,9 +43,6 @@
;;; Code:
(require 'ebdb)
-;; Require all i18n libraries provided by EBDB. Third-party i18n
-;; libraries should require this library.
-(require 'ebdb-chn)
(defgroup ebdb-i18n nil
"Options for EBDB internationalization."
