[openmeetings] branch master updated: [OPENMEETINGS-2462] lost placeholder is restored, code clean-up

[solomax]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 8b75426  [OPENMEETINGS-2462] lost placeholder is restored, code 
clean-up
8b75426 is described below

commit 8b75426fac0b0d65ff18c5a58966453f5c8ba7f5
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Mon Sep 28 20:47:08 2020 +0700

    [OPENMEETINGS-2462] lost placeholder is restored, code clean-up
---
 .../java/org/apache/openmeetings/IWebSession.java     |  1 -
 .../web/app/Application_ar.properties.xml             |  2 +-
 .../org/apache/openmeetings/web/app/WebSession.java   |  5 -----
 .../openmeetings/calendar/TestSendIcalMessage.java    | 19 ++++++++++++++++---
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/IWebSession.java 
b/openmeetings-db/src/main/java/org/apache/openmeetings/IWebSession.java
index 1368b69..6f20e00 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/IWebSession.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/IWebSession.java
@@ -21,7 +21,6 @@ package org.apache.openmeetings;
 import java.util.Locale;
 
 public interface IWebSession {
-       long getOmLanguage();
        void setLanguage(long languageId);
        Locale getLocale();
 }
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
index 5252e79..c78cbb6 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
@@ -199,7 +199,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for 
Details
        <entry key="505"><![CDATA[إذا واجهتك مشاكل مع الرابط، الرجاء نسخه و من 
ثم لصقه في المتصفح:]]></entry>
        <entry key="506"><![CDATA[تسجيل {0}]]></entry>
        <entry key="507"><![CDATA[بياناتك:]]></entry>
-       <entry key="511"><![CDATA[فريق - OpenMeeting]]></entry>
+       <entry key="511"><![CDATA[فريق - {0}]]></entry>
        <entry key="512"><![CDATA[إنشاء حساب OpenMeeting]]></entry>
        <entry key="513"><![CDATA[إعادة ضبط كلمة مرور - OpenMeeting]]></entry>
        <entry key="514"><![CDATA[انقر على هذا الرابط من أجل إدخال كلمة مرور 
جديدة:]]></entry>
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
index 2a312bf..c56386c 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
@@ -594,11 +594,6 @@ public class WebSession extends 
AbstractAuthenticatedWebSession implements IWebS
                }
        }
 
-       @Override
-       public long getOmLanguage() {
-               return getLanguage();
-       }
-
        private static void checkIsInvalid() {
                WebSession session = get();
                if (isInvaldSession(session.getId())) {
diff --git 
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestSendIcalMessage.java
 
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestSendIcalMessage.java
index 4a979dc..d255bed 100644
--- 
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestSendIcalMessage.java
+++ 
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestSendIcalMessage.java
@@ -19,15 +19,18 @@
 package org.apache.openmeetings.calendar;
 
 import static java.util.UUID.randomUUID;
+import static 
org.apache.openmeetings.util.OpenmeetingsVariables.getApplicationName;
+import static 
org.apache.openmeetings.util.OpenmeetingsVariables.setApplicationName;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.net.URI;
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import javax.activation.DataHandler;
@@ -175,8 +178,7 @@ class TestSendIcalMessage extends AbstractJUnitDefaults {
                        Map<String, String> attendeeList = 
handler.getAttendeeData(email, username, invitor);
                        Map<String, String> organizerAttendee = 
handler.getAttendeeData(recipients, "seba-test", true);
 
-                       List<Map<String, String>> atts = new ArrayList<>();
-                       atts.add(attendeeList);
+                       List<Map<String, String>> atts = List.of(attendeeList);
 
                        // Create ICal Message
                        String meetingId = 
handler.addNewMeeting(start.getTime(), end.getTime(), "test event",
@@ -231,4 +233,15 @@ class TestSendIcalMessage extends AbstractJUnitDefaults {
                // Transport trans = session.getTransport("smtp");
                Transport.send(mimeMessage);
        }
+
+       @Test
+       void testTeamLbl() {
+               final String prevAppName = getApplicationName();
+               try {
+                       setApplicationName("AAA");
+                       assertEquals("AAA-Team", app.getOmString("511", 
Locale.ENGLISH));
+               } finally {
+                       setApplicationName(prevAppName);
+               }
+       }
 }