Merge branch 'release/2.1.3'

dotStart · Jul 30, 2019 · c2b2c7b · c2b2c7b
2 parents b109cfd + a71cbf2
commit c2b2c7b
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
 
   <groupId>tv.dotstart.beacon</groupId>
   <artifactId>parent</artifactId>
-  <version>2.1.2</version>
+  <version>2.1.3</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -84,7 +84,7 @@
       <dependency>
         <groupId>tv.dotstart.beacon</groupId>
         <artifactId>repository-model</artifactId>
-        <version>2.1.2</version>
+        <version>2.1.3</version>
       </dependency>
 
       <dependency>

diff --git a/repository-compiler/pom.xml b/repository-compiler/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>parent</artifactId>
     <groupId>tv.dotstart.beacon</groupId>
-    <version>2.1.2</version>
+    <version>2.1.3</version>
   </parent>
 
   <artifactId>repository-compiler</artifactId>

diff --git a/repository-model/pom.xml b/repository-model/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>parent</artifactId>
     <groupId>tv.dotstart.beacon</groupId>
-    <version>2.1.2</version>
+    <version>2.1.3</version>
   </parent>
 
   <artifactId>repository-model</artifactId>

diff --git a/ui/pom.xml b/ui/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>parent</artifactId>
     <groupId>tv.dotstart.beacon</groupId>
-    <version>2.1.2</version>
+    <version>2.1.3</version>
   </parent>
 
   <artifactId>ui</artifactId>

diff --git a/ui/src/main/kotlin/tv/dotstart/beacon/controller/MainController.kt b/ui/src/main/kotlin/tv/dotstart/beacon/controller/MainController.kt
@@ -38,6 +38,7 @@ import tv.dotstart.beacon.exposure.PortMapper
 import tv.dotstart.beacon.repository.Model
 import tv.dotstart.beacon.repository.ServiceRegistry
 import tv.dotstart.beacon.repository.model.Port
+import tv.dotstart.beacon.util.Localization
 import tv.dotstart.beacon.util.splashWindow
 import java.net.URL
 import java.nio.file.Files
@@ -83,7 +84,7 @@ class MainController : Initializable {
         .addListener({ _, _, new -> this.onServiceSelect(new.value) })
     this.externalAddress.textProperty().bind(Bindings.createObjectBinding(
         Callable {
-          Gateway.externalAddress?.hostAddress
+          Gateway.externalAddress?.hostAddress ?: Localization("address.unknown")
         },
         Gateway.externalAddressProperty
     ))

diff --git a/ui/src/main/resources/localization/messages_de.properties b/ui/src/main/resources/localization/messages_de.properties
@@ -22,6 +22,8 @@ preload.upnp=UPnP Client wird gestartet
 preload.mapper=Port Mapper wird gestartet
 preload.gateway.fuse=Warten auf Internet Gateway
 
+address.unknown=Unbekannte Externe Adresse
+
 category.game=Spiele
 category.tool=Werkzeuge
 

diff --git a/ui/src/main/resources/localization/messages_en.properties b/ui/src/main/resources/localization/messages_en.properties
@@ -22,6 +22,8 @@ preload.upnp=Starting UPnP Client
 preload.mapper=Starting Port Mapper
 preload.gateway.fuse=Waiting for Internet Gateway
 
+address.unknown=Unknown External Address
+
 category.game=Games
 category.tool=Tools