branch: externals/ebdb
commit b08a5264ef2609b5cc789dcfe9452b02db384f0f
Author: Eric Abrahamsen <e...@ericabrahamsen.net>
Commit: Eric Abrahamsen <e...@ericabrahamsen.net>
Add ebdb-i18n-german-states variable, use in reading, bump version
* ebdb-i18n-basic.el (ebdb-i18n-german-states): New variable.
(ebdb-read-i18n): Use when reading German addresses.
---
ebdb-i18n-basic.el | 36 +++++++++++++++++++++++++++++++++++-
ebdb.el | 2 +-
2 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/ebdb-i18n-basic.el b/ebdb-i18n-basic.el
index 15da8ac..1bd6c1f 100644
--- a/ebdb-i18n-basic.el
+++ b/ebdb-i18n-basic.el
@@ -239,6 +239,40 @@ itself."
"[^[:digit:]]" "" str))))
slots))
+(defvar ebdb-i18n-german-states
+ '(("Baden-Württemberg" . "BW")
+ ("Bayern" . "BY")
+ ("Berlin" . "BE")
+ ("Brandenburg" . "BB")
+ ("Bremen" . "HB")
+ ("Hamburg" . "HH")
+ ("Hessen" . "HE")
+ ("Mecklenburg-Vorpommern" . "MV")
+ ("Niedersachsen" . "NI")
+ ("Nordrhein-Westfalen" . "NW")
+ ("Rheinland-Pfalz" . "RP")
+ ("Saarland" . "SL")
+ ("Sachsen" . "SN")
+ ("Sachsen-Anhalt" . "ST")
+ ("Schleswig-Holstein" . "SH")
+ ("Thüringen" . "TH"))
+ "All the states in Germany, for use with completion.")
+
+(cl-defmethod ebdb-read-i18n ((_class (subclass ebdb-field-address))
+ (_cc (eql deu))
+ &optional slots obj)
+ (unless (plist-member slots :region)
+ (setq slots
+ (plist-put
+ slots :region
+ (cdr (assoc-string
+ (ebdb-read-string
+ "State"
+ (when obj (ebdb-address-region obj))
+ ebdb-i18n-german-states t)
+ ebdb-i18n-german-states)))))
+ slots)
+
(cl-defmethod ebdb-string-i18n ((address ebdb-field-address)
(_cc (eql deu)))
(with-slots (streets neighborhood locality region postcode) address
@@ -248,7 +282,7 @@ itself."
(ebdb-concat ", " (ebdb-address-locality address)
(ebdb-address-neighborhood address)
(ebdb-concat " " (ebdb-address-region address)
- (ebdb-address-postcode address)))
+ (ebdb-address-postcode address)))
"\n"
(car-safe (rassq 'deu (ebdb-i18n-countries))))))
diff --git a/ebdb.el b/ebdb.el
index 753f3e6..c7ff946 100644
--- a/ebdb.el
+++ b/ebdb.el
@@ -2,7 +2,7 @@
;; Copyright (C) 2016-2021 Free Software Foundation, Inc.
-;; Version: 0.8.4
+;; Version: 0.8.5
;; Package-Requires: ((emacs "25.1") (seq "2.15"))
;; Maintainer: Eric Abrahamsen <e...@ericabrahamsen.net>
