Merge pull request #274 from devoxx/erwin1/master

#273 include room number in notifications
devoxx · Nov 11, 2019 · 53796b9 · 53796b9
2 parents b2fa57a + 6db05aa
commit 53796b9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/DevoxxClientCommon/src/main/java/com/devoxx/model/Session.java b/DevoxxClientCommon/src/main/java/com/devoxx/model/Session.java
@@ -82,6 +82,10 @@ public String getRoomName() {
         return roomName;
     }
 
+    public boolean hasRoomName() {
+        return getRoomName() != null && getRoomName().length() > 0;
+    }
+
     public void setRoomName(String roomName) {
         this.roomName = roomName;
     }

diff --git a/DevoxxClientCommon/src/main/resources/com/devoxx/devoxx.properties b/DevoxxClientCommon/src/main/resources/com/devoxx/devoxx.properties
@@ -157,6 +157,7 @@ OTN.VISUALS.SESSION_STARTING_SOON=Session Starting Soon
 OTN.VISUALS.FORMAT.MULTILINE={0} \nDay {1} \u00b7 {2}-{3} \n{4}
 OTN.VISUALS.FORMAT.ONELINE=Day {0} \u00b7 {1}-{2} \u00b7 {3}
 OTN.VISUALS.IS_ABOUT_TO_START={0} is about to start
+OTN.VISUALS.IS_ABOUT_TO_START_IN_ROOM={0} is about to start in {1}
 OTN.VISUALS.CAST_YOUR_VOTE_ON=Cast your vote on {0}
 OTN.VISUALS.HELP_US_IMPROVE_DEVOXX=Help us improve Devoxx
 OTN.VISUALS.CONNECTION_FAILED=Connection failed!

diff --git a/DevoxxClientCommon/src/main/resources/com/devoxx/devoxx_fr.properties b/DevoxxClientCommon/src/main/resources/com/devoxx/devoxx_fr.properties
@@ -161,6 +161,7 @@ OTN.VISUALS.SESSION_STARTING_SOON=La pr\u00e9sentation va bient\u00f4t commencer
 OTN.VISUALS.FORMAT.MULTILINE={0} \nJour {1} \u00b7 {2}-{3} \n{4}
 OTN.VISUALS.FORMAT.ONELINE=Day {0} \u00b7 {1}-{2} \u00b7 {3}
 OTN.VISUALS.IS_ABOUT_TO_START={0} va bient\u00f4t commencer
+OTN.VISUALS.IS_ABOUT_TO_START_IN_ROOM={0} va bient\u00f4t commencer \u00e0 {1}
 OTN.VISUALS.CAST_YOUR_VOTE_ON=Merci de donner votre vote {0}
 OTN.VISUALS.CONNECTION_FAILED=Probl\u00e8me de connexion.
 #TODO: Translate to French

diff --git a/DevoxxClientMobile/src/main/java/com/devoxx/util/DevoxxNotifications.java b/DevoxxClientMobile/src/main/java/com/devoxx/util/DevoxxNotifications.java
@@ -419,7 +419,7 @@ private Notification getStartNotification(Session session, ZonedDateTime dateTim
         return new Notification(
                 ID_START + session.getTalk().getId(),
                 TITLE_SESSION_STARTS, 
-                DevoxxBundle.getString("OTN.VISUALS.IS_ABOUT_TO_START", session.getTitle()),
+                DevoxxBundle.getString("OTN.VISUALS.IS_ABOUT_TO_START"+(session.hasRoomName()?"_IN_ROOM":""), session.getTitle(), session.getRoomName()),
                 DevoxxNotifications.class.getResourceAsStream("/icon.png"),
                 dateTimeStart,
                 () -> {