Added Umland and Region Prefix to Domain Names

Dark4MD · Feb 24, 2021 · b5b1258 · b5b1258
1 parent 85f8256
commit b5b1258
Show file tree

Hide file tree

Showing 12 changed files with 60 additions and 60 deletions.
diff --git a/domains/dom0.conf b/domains/dom0.conf
@@ -94,7 +94,6 @@
 		},
 	} } } } },
 
-	-- primary domain name "Domain 0" should be hidden in config mode
-	hide_domain = { 'dom0' },
+	hide_domain = true,
 
 }
diff --git a/domains/dom10.conf b/domains/dom10.conf
@@ -4,8 +4,8 @@
 	--
 
 	domain_names = {
-		hameln = 'Hameln',
-		alfeld = 'Alfeld',
+		hameln = 'Umland: Hameln',
+		alfeld = 'Umland: Alfeld',
 		dom10 = 'Domain 10',
 	},	
 

diff --git a/domains/dom11.conf b/domains/dom11.conf
@@ -4,7 +4,7 @@
 	--
 
 	domain_names = {
-		lenthe = 'Lenthe',
+		lenthe = 'Region: Lenthe',
 		dom11 = 'Domain 11',
 	},	
 

diff --git a/domains/dom12.conf b/domains/dom12.conf
@@ -4,7 +4,7 @@
 	--
 
 	domain_names = {
-		steinhude = 'Steinhude',
+		steinhude = 'Region: Steinhude',
 		dom12 = 'Domain 12',
 	},	
 

diff --git a/domains/dom13.conf b/domains/dom13.conf
@@ -4,8 +4,8 @@
 	--
 
 	domain_names = {
-		springe = 'Springe',
-		obernkirchen = 'Obernkirchen',
+		springe = 'Region: Springe',
+		obernkirchen = 'Umland: Obernkirchen',
 		dom13 = 'Domain 13',
 	},	
 

diff --git a/domains/dom15.conf b/domains/dom15.conf
@@ -4,9 +4,9 @@
 	--
 
 	domain_names = {
-		wunstorf = 'Wunstorf',
-		neustadt = 'Neustadt',
-		nienburg = 'Nienburg/Weser',
+		wunstorf = 'Region: Wunstorf',
+		neustadt = 'Region: Neustadt',
+		nienburg = 'Umland: Nienburg/Weser',
 		dom15 = 'Domain 15',
 	},	
 

diff --git a/domains/dom16.conf b/domains/dom16.conf
@@ -9,7 +9,7 @@
 		muehlenberg = 'Hannover: Mühlenberg',
 		bornum = 'Hannover: Bornum',
 		ricklingen = 'Hannover: Ricklingen',
-		barsinghausen = 'Barsinghausen',
+		barsinghausen = 'Region: Barsinghausen',
 		davenstedt = 'Hannover: Davenstedt',
 		ahlem = 'Hannover: Ahlem',
 		badenstedt = 'Hannover: Badenstedt',

diff --git a/domains/dom18.conf b/domains/dom18.conf
@@ -4,13 +4,13 @@
 	--
 
 	domain_names = {
-		garbsen = 'Garbsen',
-		langenhagen = 'Langenhagen',
-		seelze = 'Seelze',
-		isernhagen = 'Isernhagen',
-		burgdorf = 'Burgdorf',
-		burgwedel = 'Burgwedel',
-		uetze = 'Uetze',
+		garbsen = 'Region: Garbsen',
+		langenhagen = 'Region: Langenhagen',
+		seelze = 'Region: Seelze',
+		isernhagen = 'Region: Isernhagen',
+		burgdorf = 'Region: Burgdorf',
+		burgwedel = 'Region: Burgwedel',
+		uetze = 'Region: Uetze',
 		stoecken = 'Hannover: Stöcken',
 		marienwerder = 'Hannover: Marienwerder',
 		ledeburg = 'Hannover: Ledeburg',
@@ -22,7 +22,7 @@
 		leinhausen = 'Hannover: Leinhausen',
 		vinnhorst = 'Hannover: Vinnhorst',
 		brinkhafen = 'Hannover: Brinkhafen',
-		schwarmstedt = 'Schwarmstedt',
+		schwarmstedt = 'Umland: Schwarmstedt',
 		dom18 = 'Domain 18',
 	},	
 

diff --git a/domains/dom20.conf b/domains/dom20.conf
@@ -14,11 +14,11 @@
 		kirchrode = 'Hannover: Kirchrode',
 		anderten = 'Hannover: Anderten',
 		wuelferode = 'Hannover: Wülferode',
-		laatzen = 'Laatzen',
-		sehnde = 'Sehnde',
-		sarstedt = 'Sarstedt',
-		pattensen = 'Pattensen',
-		hildesheim = 'Hildesheim',
+		laatzen = 'Region: Laatzen',
+		sehnde = 'Region: Sehnde',
+		sarstedt = 'Region: Sarstedt',
+		pattensen = 'Region: Pattensen',
+		hildesheim = 'Umland: Hildesheim',
 		dom20 = 'Domain 20',
 	},	
 

diff --git a/domains/dom21.conf b/domains/dom21.conf
@@ -15,7 +15,7 @@
 		vahrenheide = 'Hannover: Vahrenheide',
 		list = 'Hannover: List',
 		oststadt = 'Hannover: Oststadt',
-		lehrte = 'Lehrte',
+		lehrte = 'Region: Lehrte',
 		isernhagensued = 'Hannover: Isernhagen Süd',
 		dom21 = 'Domain 21',
 	},	

diff --git a/domains/dom22.conf b/domains/dom22.conf
@@ -4,12 +4,12 @@
 	--
 
 	domain_names = {
-		umland = 'Umland',
-		wennigsen = 'Wennigsen',
-		gehrden = 'Gehrden',
-		hemmingen = 'Hemmingen',
-		ronnenberg = 'Ronnenberg',
-		peinewest = 'Peine-West',
+		umland = 'Umland: Andere',
+		wennigsen = 'Region: Wennigsen',
+		gehrden = 'Region: Gehrden',
+		hemmingen = 'Region: Hemmingen',
+		ronnenberg = 'Region: Ronnenberg',
+		peinewest = 'Region: Peine-West',
 		dom22 = 'Domain 22',
 	},	
 

diff --git a/domains/gen.py b/domains/gen.py
@@ -9,21 +9,23 @@
 THIS_DIR = os.path.dirname(os.path.abspath(__file__))
 
 h = "Hannover: "
+r = "Region: "
+u = "Umland: "
 domains = {
-    0: { "names": { "legacy": "Legacy" } },
-    10: { "names": { "hameln": "Hameln", "alfeld": "Alfeld" }, },
-    11: { "names": { "lenthe": "Lenthe" } },
-    12: { "names": { "steinhude": "Steinhude" } },
-    13: { "names": { "springe": "Springe", "obernkirchen": "Obernkirchen" } },
+    0: { "names": { "legacy": "Legacy" }, "hide": True },
+    10: { "names": { "hameln": u+"Hameln", "alfeld": u+"Alfeld" }, },
+    11: { "names": { "lenthe": r+"Lenthe" } },
+    12: { "names": { "steinhude": r+"Steinhude" } },
+    13: { "names": { "springe": r+"Springe", "obernkirchen": u+"Obernkirchen" } },
     14: { "names": { "nordstadt": h+'Nordstadt' } },
-    15: { "names": { "wunstorf": "Wunstorf", "neustadt": "Neustadt", "nienburg": "Nienburg/Weser" } },
+    15: { "names": { "wunstorf": r+"Wunstorf", "neustadt": r+"Neustadt", "nienburg": u+"Nienburg/Weser" } },
     16: { "names": {
         "wettbergen": h+'Wettbergen',
         "oberricklingen": h+"Oberricklingen",
         "muehlenberg": h+"Mühlenberg",
         "bornum": h+"Bornum",
         "ricklingen": h+"Ricklingen",
-        "barsinghausen": "Barsinghausen",
+        "barsinghausen": r+"Barsinghausen",
         "davenstedt": h+"Davenstedt",
         "ahlem": h+"Ahlem",
         "badenstedt": h+"Badenstedt"
@@ -36,14 +38,13 @@
         "calenbergerneustadt": h+'Calenberger Neustadt'
     } },
     18: { "names": {
-        "garbsen": 'Garbsen',
-        "langenhagen": 'Langenhagen',
-        "seelze": 'Seelze',
-        "isernhagen": 'Isernhagen',
-        "burgdorf": 'Burgdorf',
-        "burgwedel": 'Burgwedel',
-        "uetze": 'Uetze',
-        "langenhagen": 'Langenhagen',
+        "garbsen": r+'Garbsen',
+        "langenhagen": r+'Langenhagen',
+        "seelze": r+'Seelze',
+        "isernhagen": r+'Isernhagen',
+        "burgdorf": r+'Burgdorf',
+        "burgwedel": r+'Burgwedel',
+        "uetze": r+'Uetze',
         "stoecken": h+'Stöcken',
         "marienwerder": h+'Marienwerder',
         "ledeburg": h+'Ledeburg',
@@ -55,7 +56,7 @@
         "leinhausen": h+'Leinhausen',
         "vinnhorst": h+'Vinnhorst',
         "brinkhafen": h+'Brinkhafen',
-        "schwarmstedt": 'Schwarmstedt'
+        "schwarmstedt": u+'Schwarmstedt'
     } },
     19: { "names": {
         "mitte": h+'Mitte',
@@ -74,11 +75,11 @@
         "kirchrode": h+'Kirchrode',
         "anderten": h+'Anderten',
         "wuelferode": h+'Wülferode',
-        "laatzen": 'Laatzen',
-        "sehnde": 'Sehnde',
-        "sarstedt": 'Sarstedt',
-        "pattensen": 'Pattensen',
-        "hildesheim": 'Hildesheim'
+        "laatzen": r+'Laatzen',
+        "sehnde": r+'Sehnde',
+        "sarstedt": r+'Sarstedt',
+        "pattensen": r+'Pattensen',
+        "hildesheim": u+'Hildesheim'
     } },
     21: { "names": {
         "heideviertel": h+'Heideviertel',
@@ -92,16 +93,16 @@
         "vahrenheide": h+'Vahrenheide',
         "list": h+'List',
         "oststadt": h+'Oststadt',
-        "lehrte": 'Lehrte',
+        "lehrte": r+'Lehrte',
         "isernhagensued": h+'Isernhagen Süd',
     } },
     22: { "names": {
-        "umland": "Umland",
-        "wennigsen": "Wennigsen",
-        "gehrden": "Gehrden",
-        "hemmingen": "Hemmingen",
-        "ronnenberg": "Ronnenberg",
-        "peinewest": "Peine-West"
+        "umland": u+"Andere",
+        "wennigsen": r+"Wennigsen",
+        "gehrden": r+"Gehrden",
+        "hemmingen": r+"Hemmingen",
+        "ronnenberg": r+"Ronnenberg",
+        "peinewest": r+"Peine-West"
 	  } },
     23: { "names": { "special_port": "Special Port" }, "hide": True, "port": 500 },
     99: { "names": { "leetfeld": "Leetfeld (1337, invalid)"}, "hide": True }