branch: externals/ebdb
commit 13a9a9d1e91afde5d915a580060eb9c2f692e2d9
Author: Eric Abrahamsen <e...@ericabrahamsen.net>
Commit: Eric Abrahamsen <e...@ericabrahamsen.net>
Simplify German address formatting, bump version to 0.8.6
This will probably have to be changed again in the future, but this is
"correct enough" for now.
* ebdb-i18n-basic.el (ebdb-string-i18n): Output postcode before
locality; skip neighborhood and region for now.
---
ebdb-i18n-basic.el | 7 +++----
ebdb.el | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ebdb-i18n-basic.el b/ebdb-i18n-basic.el
index 3758993..289df39 100644
--- a/ebdb-i18n-basic.el
+++ b/ebdb-i18n-basic.el
@@ -281,10 +281,9 @@ itself."
(concat
(when streets
(concat (mapconcat #'identity streets "\n") "\n"))
- (ebdb-concat ", " (ebdb-address-locality address)
- (ebdb-address-neighborhood address)
- (ebdb-concat " " (ebdb-address-region address)
- (ebdb-address-postcode address)))
+ (when postcode
+ (format "%s " postcode))
+ locality
"\n"
(car-safe (rassq 'deu (ebdb-i18n-countries))))))
diff --git a/ebdb.el b/ebdb.el
index bf84cc1..74916f5 100644
--- a/ebdb.el
+++ b/ebdb.el
@@ -2,7 +2,7 @@
;; Copyright (C) 2016-2021 Free Software Foundation, Inc.
-;; Version: 0.8.5
+;; Version: 0.8.6
;; Package-Requires: ((emacs "25.1") (seq "2.15"))
;; Maintainer: Eric Abrahamsen <e...@ericabrahamsen.net>
