diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/Activator.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/Activator.java index 18941408d58..957f5a7dfa1 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/Activator.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/Activator.java @@ -57,7 +57,6 @@ import com.sap.sse.datamining.impl.AbstractDataMiningActivatorWithPredefinedQuer import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.PredefinedQueryIdentifier; import com.sap.sse.i18n.ResourceBundleStringMessages; -import com.sap.sse.i18n.impl.ResourceBundleStringMessagesImpl; public class Activator extends AbstractDataMiningActivatorWithPredefinedQueries { @@ -75,7 +74,7 @@ public class Activator extends AbstractDataMiningActivatorWithPredefinedQueries private boolean dataSourceProvidersHaveBeenInitialized; public Activator() { - sailingServerStringMessages = new ResourceBundleStringMessagesImpl(STRING_MESSAGES_BASE_NAME, getClassLoader(), + sailingServerStringMessages = ResourceBundleStringMessages.create(STRING_MESSAGES_BASE_NAME, getClassLoader(), StandardCharsets.UTF_8.name()); dataRetrieverChainDefinitions = new SailingDataRetrievalChainDefinitions(); predefinedQueries = new SailingPredefinedQueries(); diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogTrackingI18n.java b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogTrackingI18n.java index 72b6708ad29..50536c7fa61 100755 --- a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogTrackingI18n.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogTrackingI18n.java @@ -4,12 +4,11 @@ import java.nio.charset.StandardCharsets; import java.util.Locale; import com.sap.sse.i18n.ResourceBundleStringMessages; -import com.sap.sse.i18n.impl.ResourceBundleStringMessagesImpl; public class RaceLogTrackingI18n { private static final String RESOURCE_BASE_NAME = "stringmessages/TrackingStringMessages"; - public static final ResourceBundleStringMessages STRING_MESSAGES = new ResourceBundleStringMessagesImpl( + public static final ResourceBundleStringMessages STRING_MESSAGES = ResourceBundleStringMessages.create( RESOURCE_BASE_NAME, RaceLogTrackingI18n.class.getClassLoader(), StandardCharsets.UTF_8.name()); public static String trackingInvitationFor(final Locale locale, final String invitee) { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/solutions/Solutions.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/solutions/Solutions.java index 57d8a12865c..216fc6db22f 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/solutions/Solutions.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/solutions/Solutions.java @@ -1,5 +1,7 @@ package com.sap.sailing.gwt.home.desktop.partials.solutions; +import java.util.Optional; + import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.Scheduler; import com.google.gwt.dom.client.DivElement; @@ -85,6 +87,7 @@ public class Solutions extends Composite { simulatorDivGridAlternator.getStyle().setBackgroundImage("url(\'"+ClientConfiguration.getInstance().getSailingSimulatorImageURL()+"\')"); raceDivGridAlternator.getStyle().setBackgroundImage("url(\'"+ClientConfiguration.getInstance().getSailingRaceManagerAppImageURL()+"\')"); buoyPingerDivGridAlternator.getStyle().setBackgroundImage("url(\'"+ClientConfiguration.getInstance().getBuoyPingerAppImageURL()+"\')"); + sailingAnalyticsDetailsAnchor.setText(ClientConfiguration.getInstance().getSailingAnalyticsReadMoreText(Optional.empty())); sailingAnalyticsDetailsNavigation = placesNavigator.getWhatsNewNavigation(WhatsNewNavigationTabs.SailingAnalytics); raceCommitteeAppDetailsNavigation = placesNavigator.getWhatsNewNavigation(WhatsNewNavigationTabs.RaceManagerApp); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/solutions/Solutions.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/solutions/Solutions.ui.xml index 5fc5635be08..1768e89b700 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/solutions/Solutions.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/solutions/Solutions.ui.xml @@ -95,9 +95,7 @@

- - + diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/Solutions.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/Solutions.java index 25e82f1aa98..22c2c55c85b 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/Solutions.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/Solutions.java @@ -1,5 +1,7 @@ package com.sap.sailing.gwt.home.mobile.partials.solutions; +import java.util.Optional; + import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.AnchorElement; import com.google.gwt.uibinder.client.UiBinder; @@ -40,6 +42,7 @@ public class Solutions extends Composite { sapSailInSight.setImageUrl(ClientConfiguration.getInstance().getSailInSightAppImageURL()); sailingBuoyPinger.setImageUrl(ClientConfiguration.getInstance().getBuoyPingerAppImageURL()); strategySimulator.setImageUrl(ClientConfiguration.getInstance().getSailingSimulatorTrimmedImageURL()); + sailingAnalyticsDetailsAnchor.setInnerText(ClientConfiguration.getInstance().getSailingAnalyticsReadMoreText(Optional.empty())); initWhatsNewLink(placesNavigator, WhatsNewNavigationTabs.SailingAnalytics, sailingAnalyticsDetailsAnchor); initWhatsNewLink(placesNavigator, WhatsNewNavigationTabs.RaceManagerApp, raceManagerAppDetailsAnchor); initWhatsNewLink(placesNavigator, WhatsNewNavigationTabs.InSightApp, sailInSightAppDetailsAnchor); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/Solutions.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/Solutions.ui.xml index d49457bebe0..59efbddccb4 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/Solutions.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/Solutions.ui.xml @@ -59,7 +59,6 @@

- diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties index ededce613e9..a5089f14bdb 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties @@ -1749,7 +1749,6 @@ contentSapInSailing13=Official Technology Partner of WORLD SAILING sapSailingAnalyticsTitle=SAP Sailing Analytics contentSapSailingAnalytics1=By delivering real time analytics around race rankings, speeds, maneuvers, bearings etc., SAP is helping to simplify and demystify the complex sport of sailing. contentSapSailingAnalytics2=SAP Sailing Analytics provide insights and transparency to the world of sailing by utilizing Cloud and In-Memory Technology, processing GPS and wind measurement data in real time and visualizing contents in various frontends accessible from anywhere. -sapSailingAnalyticsReadMore=Read More sapSailingRaceManager=SAP Sailing Race Manager contentSapSailingRaceManager=The SAP Sailing Race Manager delivers greater efficiency and control to race organizers by automating and simplifying their manual tasks and communication during running sailing regattas. The Race Committee App helps simplify the operation of running and managing race events to help race committees operate smarter. sapSailingRaceManagerReadMore=Learn More diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_cs.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_cs.properties index d1d922b5281..2aeb1f31547 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_cs.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_cs.properties @@ -1742,7 +1742,6 @@ contentSapInSailing13=světové organizace World Sailing, jejímž je oficiáln sapSailingAnalyticsTitle=SAP Sailing Analytics contentSapSailingAnalytics1=SAP nabízí analýzy v reálném čase, které sledují pořadí, rychlost, směr a manévry lodí, a pomáhá tak zpřehlednit a zpřístupnit komplexní informace z jachtingu. contentSapSailingAnalytics2=S pomocí cloudové a in-memory technologie, zpracování dat z GPS a anemometrů a vizualizací výsledků dostupných odkudkoli a v nejrůznějších zobrazovacích prostředích SAP Sailing Analytics zajišťuje transparentnost a informovanost o jachtařském sportu. -sapSailingAnalyticsReadMore=Další informace sapSailingRaceManager=SAP Sailing Race Manager contentSapSailingRaceManager=SAP Sailing Race Manager přináší organizátorům závodů možnost účinnějšího řízení a lepší kontroly díky zjednodušení manuálních úkonů a automatizaci některých procesů včetně komunikace během regat. Aplikace Race Committee usnadňuje organizování a řízení závodů a umožňuje závodním komisím kvalitnější práci. sapSailingRaceManagerReadMore=Další informace diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties index a854a0fd5f5..d1de54b181e 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties @@ -1725,7 +1725,6 @@ contentSapInSailing13=Offizieller Technologiepartner von WORLD SAILING sapSailingAnalyticsTitle=SAP Sailing Analytics contentSapSailingAnalytics1=Durch die Bereitstellung von Echtzeit-Analysen zu Ranglisten, Geschwindigkeiten, Manövern, Kursen etc. trägt SAP dazu bei, die komplexe Welt des Segelns einfacher und verständlicher zu machen. contentSapSailingAnalytics2=SAP Sailing Analytics nutzt Cloud- und In-Memory-Technologie, verarbeitet GPS- und Winddaten in Echtzeit und visualisiert Inhalte in verschiedenen Frontends, die von überall zugänglich sind, um transparente Einblicke in die Welt des Segelns zu liefern. -sapSailingAnalyticsReadMore=Mehr lesen sapSailingRaceManager=SAP Sailing Race Manager contentSapSailingRaceManager=Der SAP Sailing Race Manager bietet Rennveranstaltern mehr Effizienz und Kontrolle, indem sie ihre manuellen Aufgaben und die Kommunikation während Regatten automatisiert und vereinfacht. Die Race Committee App unterstützt die Durchführung und Abwicklung von Segelrennen und hilft Rennleitungen dadurch, intelligenter zu arbeiten. sapSailingRaceManagerReadMore=Mehr erfahren diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_es.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_es.properties index 72b73ffd08f..20eb7c6b594 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_es.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_es.properties @@ -1742,7 +1742,6 @@ contentSapInSailing13=Socio tecnológico oficial de WORLD SAILING sapSailingAnalyticsTitle=SAP Sailing Analytics contentSapSailingAnalytics1=Al proporcionar análisis en tiempo real sobre clasificaciones de prueba, velocidades, maniobras, marcaciones, etc. SAP permite simplificar y desmitificar la complejidad del deporte de la navegación. contentSapSailingAnalytics2=SAP Sailing Analytics proporciona conocimientos y transparencia en el mundo de la navegación con la tecnología Cloud e In-Memory, procesando datos de medida GPS y de viento en tiempo real y visualizando contenidos en diversos front ends accesibles desde cualquier lugar. -sapSailingAnalyticsReadMore=Leer más sapSailingRaceManager=SAP Sailing Race Manager contentSapSailingRaceManager=El SAP Sailing Race Manager proporciona una mayor eficacia y control a organizadores de pruebas automatizando y simplificando sus tareas manuales y la comunicación durante las regatas de navegación. La aplicación Race Commitee ayuda a simplificar la operación de ejecución y gestión de eventos regatistas para ayudar a los comités de prueba a operar de manera más inteligente. sapSailingRaceManagerReadMore=Más información diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_fr.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_fr.properties index d9c8d3ed9f8..0e55d0f5b95 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_fr.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_fr.properties @@ -1742,7 +1742,6 @@ contentSapInSailing13=Partenaire technologique officiel de WORLD SAILING sapSailingAnalyticsTitle=SAP Sailing Analytics contentSapSailingAnalytics1=Grâce aux analyses en temps réel des classements de course, vitesses, manœuvres, directions etc., SAP contribue à lever le mystère de la discipline complexe qu''est la voile, et à faciliter son approche. contentSapSailingAnalytics2=Grâce aux analyses de la solution SAP Sailing Analytics, le monde de la voile gagne en transparence. Les éléments clés sont l''utilisation du Cloud et des technologies du traitement des données en mémoire vive, le traitement des données de GPS et de mesures de vent en temps réel ainsi que la visualisation de ces contenus sur différents types frontend, accessibles partout. -sapSailingAnalyticsReadMore=En savoir plus sapSailingRaceManager=SAP Sailing Race Manager contentSapSailingRaceManager=Grâce à la solution SAP Sailing Race Manager, les organisateurs de courses peuvent être plus efficaces et garder plus facilement la main. Leurs tâches manuelles sont automatisées et simplifiées, tout comme la communication pendant les régates de voile en cours. L''application destinée au comité de course contribue à faciliter la mise en œuvre et la gestion des manifestations de courses pour un déroulement plus souple des compétitions. sapSailingRaceManagerReadMore=En savoir plus diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ja.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ja.properties index cd12e886c39..56279b1099f 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ja.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ja.properties @@ -1742,7 +1742,6 @@ contentSapInSailing13=WORLD SAILING の公式テクノロジーパートナー sapSailingAnalyticsTitle=SAP Sailing Analytics contentSapSailingAnalytics1=レースランキング、速力、操縦、ベアリングなどに関係するリアルタイム分析を提供することにより、SAP はセーリングという複雑なスポーツを簡略に分かりやすく説明することをお手伝いしています。 contentSapSailingAnalytics2=SAP Sailing Analytics は、クラウドおよびインメモリ技術を活用し、リアルタイムで GPS および風計測データを処理し、どこからでもアクセスできるさまざまなフロントエンドでコンテンツを視覚化することによってセーリングの世界にインサイトと透明性を提供します。 -sapSailingAnalyticsReadMore=続きを読む sapSailingRaceManager=SAP Sailing Race Manager contentSapSailingRaceManager=SAP Sailing Race Manager は、セーリングレガッタ運営中にレース組織者が手動で行う作業や連絡業務を自動化／簡略化することによって効率と統制を向上させます。Race Committee アプリは、レースイベントの運営／管理業務を簡略化するのに役立ち、レース委員会がより円滑に運営されるよう支援します。 sapSailingRaceManagerReadMore=詳細情報 diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_pt.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_pt.properties index 3e7d75b0ec3..b87a4575923 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_pt.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_pt.properties @@ -1742,7 +1742,6 @@ contentSapInSailing13=Parceiro de tecnologia oficial de WORLD SAILING sapSailingAnalyticsTitle=SAP Sailing Analytics contentSapSailingAnalytics1=Ao oferecer análises em tempo real de classificações de corridas, velocidades, manobras, rumos, etc., a SAP ajuda a simplificar e desmistificar o complexo esporte da vela. contentSapSailingAnalytics2=SAP Sailing Analytics fornece análises e transparência do mundo da vela utilizando tecnologia na nuvem e in-memory, processando dados de GPS e de medição do vento em tempo real e visualizando os conteúdos em vários front ends acessíveis a partir de qualquer ponto. -sapSailingAnalyticsReadMore=Ler mais sapSailingRaceManager=SAP Sailing Race Manager contentSapSailingRaceManager=O SAP Sailing Race Manager fornece maior eficiência e controle aos organizadores das corridas automatizando e simplificando suas tarefas manuais e a comunicação durante as regatas a vela. O app da comissão da corrida ajuda a simplificar a operação de gerenciamento e administração dos eventos de corridas de forma a ajudar as comissões das corridas a funcionarem de forma mais inteligente. sapSailingRaceManagerReadMore=Saber mais diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties index ea7ec5f74f0..f61cb148965 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties @@ -1742,7 +1742,6 @@ contentSapInSailing13=Официальный технологический па sapSailingAnalyticsTitle=SAP Sailing Analytics contentSapSailingAnalytics1=Предоставляя аналитику по данным о рангах в гонке, скоростях, маневрах, ветрах и т. д. в режиме реального времени, SAP помогает упростить и демистифицировать сложный парусный спорт. contentSapSailingAnalytics2=SAP Sailing Analytics делает мир парусного спорта понятным и прозрачным, используя облако и технологию In-Memory, обработку данных GPS и параметров ветра в реальном времени, а также визуализацию контекста в разных пользовательских интерфейсах, доступных где угодно. -sapSailingAnalyticsReadMore=См. также sapSailingRaceManager=SAP Sailing Race Manager contentSapSailingRaceManager=Приложение SAP Sailing Race Manager повышает уровень эффективности и контроля для организаторов гонки за счет автоматизации и упрощения выполняемых вручную задач и общения во время проведения парусных регат. Приложение Race Committee помогает упростить проведение событий и управление ими, освобождая для оргкомитета время на лучшую проработку деталей. sapSailingRaceManagerReadMore=Узнать больше diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_sl.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_sl.properties index 5fcb00ffdbe..f21a2d364ca 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_sl.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_sl.properties @@ -1742,7 +1742,6 @@ contentSapInSailing13=uradni tehnološki partner za WORLD SAILING. sapSailingAnalyticsTitle=SAP Sailing Analytics contentSapSailingAnalytics1=SAP s sprotno analitiko razvrstitev v plovih, hitrosti, manevrov, smeri idr. pomaga poenostaviti in osvetliti zapleten svet jadranja. contentSapSailingAnalytics2=SAP Sailing Analytics zagotavlja vpoglede in vnaša preglednost v svet jadranja, za kar uporablja tehnologijo Cloud ter In-Memory, sprotno obdelavo GPS-podatkov in podatkov o meritvah vetra ter vizualizacijo vsebin v različnih frontendih, ki so dostopni povsod. -sapSailingAnalyticsReadMore=Več informacij sapSailingRaceManager=SAP Sailing Race Manager contentSapSailingRaceManager=SAP Sailing Race Manager organizatorjem plovov prinaša večjo učinkovitost in nadzor, saj avtomatizira in poenostavlja opravila, ki jih sicer izvajajo ročno, in komunikacijo med regatami. Aplikacija Race Committee pomaga poenostaviti izvajanje in upravljanje dogodkov med plovi, da lahko regatni odbori pametneje opravljajo svoje delo. sapSailingRaceManagerReadMore=Več o tem diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties index 709c3b978ec..802087ea36b 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties @@ -1742,7 +1742,6 @@ contentSapInSailing13=世界帆船运动的官方技术合作伙伴 sapSailingAnalyticsTitle=SAP Sailing Analytics contentSapSailingAnalytics1=通过实时分析比赛轮次排名、速度、操作和航向角等，SAP 可简化此复杂的航行运动，使其浅显易懂。 contentSapSailingAnalytics2=SAP Sailing Analytics 利用云和内存技术实时处理 GPS 和风力测量数据，并在可从任何地方访问的前端显示，让用户全面、透彻地了解航行运动。 -sapSailingAnalyticsReadMore=更多信息 sapSailingRaceManager=SAP Sailing Race Manager contentSapSailingRaceManager=SAP Sailing Race Manager 通过自动化及简化赛事主办机构在航行比赛期间的人工作业和沟通，实现更高的效率和控制能力。Race Committee 应用简化举办和管理比赛活动的操作，使竞赛委员会的操作更加智能。 sapSailingRaceManagerReadMore=了解更多 diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java index f9b535a6511..d8e29c063b3 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java @@ -488,7 +488,6 @@ import com.sap.sse.gwt.shared.replication.ReplicaDTO; import com.sap.sse.gwt.shared.replication.ReplicationMasterDTO; import com.sap.sse.gwt.shared.replication.ReplicationStateDTO; import com.sap.sse.i18n.ResourceBundleStringMessages; -import com.sap.sse.i18n.impl.ResourceBundleStringMessagesImpl; import com.sap.sse.pairinglist.PairingList; import com.sap.sse.pairinglist.PairingListTemplate; import com.sap.sse.pairinglist.impl.PairingListTemplateImpl; @@ -659,7 +658,7 @@ public class SailingServiceImpl extends ResultCachingProxiedRemoteServiceServlet // providing the updates is not outperformed by all the re-calculations happening here. Leave at least one // core to other things, but by using at least three threads ensure that no simplistic deadlocks may occur. executor = ThreadPoolUtil.INSTANCE.getDefaultForegroundTaskThreadPoolExecutor(); - serverStringMessages = new ResourceBundleStringMessagesImpl(STRING_MESSAGES_BASE_NAME, + serverStringMessages = ResourceBundleStringMessages.create(STRING_MESSAGES_BASE_NAME, this.getClass().getClassLoader(), StandardCharsets.UTF_8.name()); if (context != null) { activator.setSailingService(this); // register so this service is informed when the bundle shuts down diff --git a/java/com.sap.sailing.landscape/src/com/sap/sailing/landscape/impl/LandscapeServiceImpl.java b/java/com.sap.sailing.landscape/src/com/sap/sailing/landscape/impl/LandscapeServiceImpl.java index a26eecd8f4e..33b2d17e7db 100644 --- a/java/com.sap.sailing.landscape/src/com/sap/sailing/landscape/impl/LandscapeServiceImpl.java +++ b/java/com.sap.sailing.landscape/src/com/sap/sailing/landscape/impl/LandscapeServiceImpl.java @@ -66,7 +66,6 @@ import com.sap.sse.common.Util.Pair; import com.sap.sse.common.Util.Triple; import com.sap.sse.common.mail.MailException; import com.sap.sse.i18n.ResourceBundleStringMessages; -import com.sap.sse.i18n.impl.ResourceBundleStringMessagesImpl; import com.sap.sse.landscape.DefaultProcessConfigurationVariables; import com.sap.sse.landscape.InboundReplicationConfiguration; import com.sap.sse.landscape.Landscape; @@ -1674,7 +1673,7 @@ public class LandscapeServiceImpl implements LandscapeService { AwsApplicationReplicaSet> replicaSet, final String subjectMessageKey, final String bodyMessageKey, Optional alsoSendToAllUsersWithThisPermissionOnReplicaSet) throws MailException { final Iterable usersToSendMailTo = getSecurityService().getUsersToInformAboutReplicaSet(replicaSet.getServerName(), alsoSendToAllUsersWithThisPermissionOnReplicaSet); - final ResourceBundleStringMessages stringMessages = new ResourceBundleStringMessagesImpl(STRING_MESSAGES_BASE_NAME, getClass().getClassLoader(), StandardCharsets.UTF_8.name()); + final ResourceBundleStringMessages stringMessages = ResourceBundleStringMessages.create(STRING_MESSAGES_BASE_NAME, getClass().getClassLoader(), StandardCharsets.UTF_8.name()); for (final User user : usersToSendMailTo) { final String subject = stringMessages.get(user.getLocaleOrDefault(), subjectMessageKey, replicaSet.getServerName()); final String body = stringMessages.get(user.getLocaleOrDefault(), bodyMessageKey, replicaSet.getServerName()); diff --git a/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/Activator.java b/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/Activator.java index 10ba091cb3f..6591d2c290c 100644 --- a/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/Activator.java +++ b/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/Activator.java @@ -23,7 +23,6 @@ import com.sap.sse.datamining.components.AggregationProcessorDefinition; import com.sap.sse.datamining.components.DataRetrieverChainDefinition; import com.sap.sse.datamining.impl.AbstractDataMiningActivator; import com.sap.sse.i18n.ResourceBundleStringMessages; -import com.sap.sse.i18n.impl.ResourceBundleStringMessagesImpl; /** * Handles all necessary registration for a datamining bundle. See @@ -47,7 +46,7 @@ public class Activator extends AbstractDataMiningActivator { public Activator() { dataRetrieverChainDefinitions = new PolarsDataRetrievalChainDefinitions(); - sailingServerStringMessages = new ResourceBundleStringMessagesImpl(STRING_MESSAGES_BASE_NAME, getClassLoader(), + sailingServerStringMessages = ResourceBundleStringMessages.create(STRING_MESSAGES_BASE_NAME, getClassLoader(), StandardCharsets.UTF_8.name()); } diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionAllInOneImportServlet.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionAllInOneImportServlet.java index a145dba38b1..906e398f206 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionAllInOneImportServlet.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionAllInOneImportServlet.java @@ -24,7 +24,6 @@ import com.sap.sailing.domain.racelogtracking.RaceLogTrackingAdapterFactory; import com.sap.sailing.server.gateway.impl.AbstractFileUploadServlet; import com.sap.sailing.server.gateway.trackfiles.impl.ExpeditionAllInOneImporter.ImporterResult; import com.sap.sse.i18n.ResourceBundleStringMessages; -import com.sap.sse.i18n.impl.ResourceBundleStringMessagesImpl; import com.sap.sse.util.ServiceTrackerFactory; /** @@ -47,7 +46,7 @@ public class ExpeditionAllInOneImportServlet extends AbstractFileUploadServlet { super.init(config); raceLogTrackingAdapterTracker = ServiceTrackerFactory.createAndOpen(getContext(), RaceLogTrackingAdapterFactory.class); - serverStringMessages = new ResourceBundleStringMessagesImpl(STRING_MESSAGES_BASE_NAME, + serverStringMessages = ResourceBundleStringMessages.create(STRING_MESSAGES_BASE_NAME, this.getClass().getClassLoader(), StandardCharsets.UTF_8.name()); } diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/notification/impl/NotificationSetNotification.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/notification/impl/NotificationSetNotification.java index 733304e2872..7e35e7c00dc 100644 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/notification/impl/NotificationSetNotification.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/notification/impl/NotificationSetNotification.java @@ -11,7 +11,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.sap.sse.common.Util.Pair; -import com.sap.sse.i18n.impl.ResourceBundleStringMessagesImpl; +import com.sap.sse.i18n.ResourceBundleStringMessages; import com.sap.sse.mail.MailService; import com.sap.sse.mail.SerializableDefaultMimeBodyPartSupplier; import com.sap.sse.mail.SerializableFileMimeBodyPartSupplier; @@ -60,7 +60,7 @@ public abstract class NotificationSetNotification implements MailNotification private final T objectToNotifyAbout; private final PreferenceObjectBasedNotificationSet associatedNotificationSet; - private static final ResourceBundleStringMessagesImpl messages = new ResourceBundleStringMessagesImpl( + private static final ResourceBundleStringMessages messages = ResourceBundleStringMessages.create( SailingNotificationServiceImpl.STRING_MESSAGES_BASE_NAME, NotificationSetNotification.class.getClassLoader(), StandardCharsets.UTF_8.name()); diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/notification/impl/SailingNotificationServiceImpl.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/notification/impl/SailingNotificationServiceImpl.java index 8714742a773..0d38e97a78b 100644 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/notification/impl/SailingNotificationServiceImpl.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/notification/impl/SailingNotificationServiceImpl.java @@ -31,7 +31,7 @@ import com.sap.sse.common.Stoppable; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; -import com.sap.sse.i18n.impl.ResourceBundleStringMessagesImpl; +import com.sap.sse.i18n.ResourceBundleStringMessages; import com.sap.sse.mail.queue.MailQueue; public class SailingNotificationServiceImpl implements SailingNotificationService { @@ -42,7 +42,7 @@ public class SailingNotificationServiceImpl implements SailingNotificationServic private final Set toStop = new HashSet<>(); private final MailQueue mailQueue; private RacingEventService racingEventService; - private final ResourceBundleStringMessagesImpl messages; + private final ResourceBundleStringMessages messages; private final BoatClassResultsNotificationSet boatClassResults; private final BoatClassUpcomingRaceNotificationSet boatClassUpcomingRace; @@ -59,7 +59,7 @@ public class SailingNotificationServiceImpl implements SailingNotificationServic BoatClassUpcomingRaceNotificationSet boatClassUpcomingRace, CompetitorResultsNotificationSet competitorResults) throws MalformedURLException { this.mailQueue = mailQueue; - this.messages = new ResourceBundleStringMessagesImpl(STRING_MESSAGES_BASE_NAME, + this.messages = ResourceBundleStringMessages.create(STRING_MESSAGES_BASE_NAME, this.getClass().getClassLoader(), StandardCharsets.UTF_8.name()); toStop.add(this.boatClassResults = boatClassResults); toStop.add(this.boatClassUpcomingRace = boatClassUpcomingRace); diff --git a/java/com.sap.sse.branding.sap/.classpath b/java/com.sap.sse.branding.sap/.classpath index eca7bdba8f0..110168ffa19 100644 --- a/java/com.sap.sse.branding.sap/.classpath +++ b/java/com.sap.sse.branding.sap/.classpath @@ -3,5 +3,6 @@ + diff --git a/java/com.sap.sse.branding.sap/META-INF/MANIFEST.MF b/java/com.sap.sse.branding.sap/META-INF/MANIFEST.MF index 4b66a3af4b1..1dafad52aab 100644 --- a/java/com.sap.sse.branding.sap/META-INF/MANIFEST.MF +++ b/java/com.sap.sse.branding.sap/META-INF/MANIFEST.MF @@ -10,6 +10,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Automatic-Module-Name: com.sap.sse.branding.sap Import-Package: com.sap.sse.branding, com.sap.sse.branding.shared, + com.sap.sse.i18n, org.osgi.framework;version="1.3.0" Bundle-ActivationPolicy: lazy Web-ContextPath: /sap-branding diff --git a/java/com.sap.sse.branding.sap/build.properties b/java/com.sap.sse.branding.sap/build.properties index 01c351fc575..421317c82fb 100644 --- a/java/com.sap.sse.branding.sap/build.properties +++ b/java/com.sap.sse.branding.sap/build.properties @@ -1,4 +1,5 @@ -source.. = src/ +source.. = src/,\ + resources/ output.. = bin/ bin.includes = META-INF/,\ .,\ diff --git a/java/com.sap.sse.branding.sap/resources/stringmessages/SAPBrandingStringMessages_de.properties b/java/com.sap.sse.branding.sap/resources/stringmessages/SAPBrandingStringMessages_de.properties new file mode 100644 index 00000000000..1386d9438bf --- /dev/null +++ b/java/com.sap.sse.branding.sap/resources/stringmessages/SAPBrandingStringMessages_de.properties @@ -0,0 +1 @@ +sailingAnalyticsReadMore=Mehr lesen diff --git a/java/com.sap.sse.branding.sap/resources/stringmessages/SAPBrandingStringMessages_en.properties b/java/com.sap.sse.branding.sap/resources/stringmessages/SAPBrandingStringMessages_en.properties new file mode 100644 index 00000000000..148fe3db3fc --- /dev/null +++ b/java/com.sap.sse.branding.sap/resources/stringmessages/SAPBrandingStringMessages_en.properties @@ -0,0 +1 @@ +sailingAnalyticsReadMore=Read More diff --git a/java/com.sap.sse.branding.sap/src/com/sap/sse/branding/sap/SAPBrandingConfiguration.java b/java/com.sap.sse.branding.sap/src/com/sap/sse/branding/sap/SAPBrandingConfiguration.java index 67dc9ac1a47..ec36f0691e2 100644 --- a/java/com.sap.sse.branding.sap/src/com/sap/sse/branding/sap/SAPBrandingConfiguration.java +++ b/java/com.sap.sse.branding.sap/src/com/sap/sse/branding/sap/SAPBrandingConfiguration.java @@ -1,15 +1,22 @@ package com.sap.sse.branding.sap; +import java.nio.charset.StandardCharsets; +import java.util.Locale; import java.util.Optional; import com.sap.sse.branding.shared.BrandingConfiguration; +import com.sap.sse.i18n.ResourceBundleStringMessages; public class SAPBrandingConfiguration implements BrandingConfiguration { public static final String ID = "SAP"; private String defaultBrandingLogoURL; private String greyTransparentLogoURL; + private final ResourceBundleStringMessages sailingServerStringMessages; + private static final String STRING_MESSAGES_BASE_NAME = "stringmessages/SAPBrandingStringMessages"; public SAPBrandingConfiguration() { + sailingServerStringMessages = ResourceBundleStringMessages.create(STRING_MESSAGES_BASE_NAME, getClass().getClassLoader(), + StandardCharsets.UTF_8.name()); } @Override @@ -76,4 +83,9 @@ public class SAPBrandingConfiguration implements BrandingConfiguration { public String getSailingAnalyticsImageURL() { return "/sap-branding/images/solutions-sap.png"; } + + @Override + public String getSailingAnalyticsReadMoreText(Optional locale) { + return sailingServerStringMessages.get(locale.map(l->Locale.forLanguageTag(l)).orElse(Locale.ENGLISH), "sailingAnalyticsReadMore"); + } } diff --git a/java/com.sap.sse.branding/src/com/sap/sse/branding/BrandingConfigurationService.java b/java/com.sap.sse.branding/src/com/sap/sse/branding/BrandingConfigurationService.java index 0bdaa6ca19f..ce68ff2de79 100644 --- a/java/com.sap.sse.branding/src/com/sap/sse/branding/BrandingConfigurationService.java +++ b/java/com.sap.sse.branding/src/com/sap/sse/branding/BrandingConfigurationService.java @@ -99,6 +99,8 @@ public interface BrandingConfigurationService { SAILING_ANALYTICS_IMAGE_URL("sailingAnalyticsImageURL"), + SAILING_ANALYTICS_READ_MORE_TEXT("sailingAnalyticsReadMoreText"), + /** * If you place the value of the property identified by this constant into a {@code script} tag in a HTML/JSP page, it will * set the {@code document.clientConfigurationContext} object to a JSON object that contains all the branding fields. diff --git a/java/com.sap.sse.branding/src/com/sap/sse/branding/impl/BrandingConfigurationServiceImpl.java b/java/com.sap.sse.branding/src/com/sap/sse/branding/impl/BrandingConfigurationServiceImpl.java index d24c71bc7df..f1adc3c94c7 100644 --- a/java/com.sap.sse.branding/src/com/sap/sse/branding/impl/BrandingConfigurationServiceImpl.java +++ b/java/com.sap.sse.branding/src/com/sap/sse/branding/impl/BrandingConfigurationServiceImpl.java @@ -119,6 +119,7 @@ public class BrandingConfigurationServiceImpl implements BrandingConfigurationSe map.put(BrandingConfigurationProperty.SAIL_IN_SIGHT_APP_IMAGE_URL, brandingConfiguration == null ? "" : brandingConfiguration.getSailInSightAppImageURL()); map.put(BrandingConfigurationProperty.BUOY_PINGER_APP_IMAGE_URL, brandingConfiguration == null ? "" : brandingConfiguration.getBuoyPingerAppImageURL()); map.put(BrandingConfigurationProperty.SAILING_ANALYTICS_IMAGE_URL, brandingConfiguration == null ? "" : brandingConfiguration.getSailingAnalyticsImageURL()); + map.put(BrandingConfigurationProperty.SAILING_ANALYTICS_READ_MORE_TEXT, brandingConfiguration == null ? "" : brandingConfiguration.getSailingAnalyticsReadMoreText(locale)); map.put(BrandingConfigurationProperty.DEBRANDING_ACTIVE_JSP_PROPERTY_NAME, !isBrandingActive()); map.put(BrandingConfigurationProperty.BRANDING_ACTIVE_JSP_PROPERTY_NAME, isBrandingActive()); map.put(BrandingConfigurationProperty.DASH_WHITELABELED_JSP_PROPERTY_NAME, whitelabeled); diff --git a/java/com.sap.sse.branding/src/com/sap/sse/branding/shared/BrandingConfiguration.java b/java/com.sap.sse.branding/src/com/sap/sse/branding/shared/BrandingConfiguration.java index c99049f69aa..9d4e566a524 100644 --- a/java/com.sap.sse.branding/src/com/sap/sse/branding/shared/BrandingConfiguration.java +++ b/java/com.sap.sse.branding/src/com/sap/sse/branding/shared/BrandingConfiguration.java @@ -31,4 +31,6 @@ public interface BrandingConfiguration { String getBuoyPingerAppImageURL(); String getSailingAnalyticsImageURL(); + + String getSailingAnalyticsReadMoreText(Optional locale); } diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/TestsUtil.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/TestsUtil.java index ac998def438..b90bebed3f2 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/TestsUtil.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/TestsUtil.java @@ -47,7 +47,7 @@ public class TestsUtil { EXTENDED_STRING_MESSAGES = new CompoundResourceBundleStringMessages(); EXTENDED_STRING_MESSAGES.addStringMessages(getTestStringMessages()); EXTENDED_STRING_MESSAGES - .addStringMessages(new ResourceBundleStringMessagesImpl(PRODUCTIVE_STRING_MESSAGES_BASE_NAME, + .addStringMessages(ResourceBundleStringMessages.create(PRODUCTIVE_STRING_MESSAGES_BASE_NAME, TestsUtil.class.getClassLoader(), StandardCharsets.UTF_8.name())); } diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/DataMiningFrameworkActivator.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/DataMiningFrameworkActivator.java index 74578f7f4aa..03cd461a7b6 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/DataMiningFrameworkActivator.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/DataMiningFrameworkActivator.java @@ -46,7 +46,7 @@ import com.sap.sse.datamining.impl.components.management.FunctionManager; import com.sap.sse.datamining.impl.components.management.QueryDefinitionDTOManager; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.PredefinedQueryIdentifier; -import com.sap.sse.i18n.impl.ResourceBundleStringMessagesImpl; +import com.sap.sse.i18n.ResourceBundleStringMessages; import com.sap.sse.util.ThreadPoolUtil; public class DataMiningFrameworkActivator implements BundleActivator { @@ -81,7 +81,7 @@ public class DataMiningFrameworkActivator implements BundleActivator { dataRetrieverChainDefinitionRegistry, aggregationProcessorDefinitionRegistry, queryDefinitionRegistry); - dataMiningServer.addStringMessages(new ResourceBundleStringMessagesImpl(STRING_MESSAGES_BASE_NAME, + dataMiningServer.addStringMessages(ResourceBundleStringMessages.create(STRING_MESSAGES_BASE_NAME, this.getClass().getClassLoader(), StandardCharsets.UTF_8.name())); for (AggregationProcessorDefinition aggregationProcessorDefinition : getDefaultAggregationProcessors()) { dataMiningServer.registerAggregationProcessor(aggregationProcessorDefinition); diff --git a/java/com.sap.sse.filestorage/src/com/sap/sse/filestorage/impl/FileStorageI18n.java b/java/com.sap.sse.filestorage/src/com/sap/sse/filestorage/impl/FileStorageI18n.java index a8700e48d6a..ded06f34c66 100644 --- a/java/com.sap.sse.filestorage/src/com/sap/sse/filestorage/impl/FileStorageI18n.java +++ b/java/com.sap.sse.filestorage/src/com/sap/sse/filestorage/impl/FileStorageI18n.java @@ -3,11 +3,10 @@ package com.sap.sse.filestorage.impl; import java.nio.charset.StandardCharsets; import com.sap.sse.i18n.ResourceBundleStringMessages; -import com.sap.sse.i18n.impl.ResourceBundleStringMessagesImpl; public class FileStorageI18n { private static final String RESOURCE_BASE_NAME = "stringmessages/FileStorageStringMessages"; - public static final ResourceBundleStringMessages STRING_MESSAGES = new ResourceBundleStringMessagesImpl( + public static final ResourceBundleStringMessages STRING_MESSAGES = ResourceBundleStringMessages.create( RESOURCE_BASE_NAME, FileStorageI18n.class.getClassLoader(), StandardCharsets.UTF_8.name()); } diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/context/data/ClientConfigurationContextDataJSO.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/context/data/ClientConfigurationContextDataJSO.java index 2b0f050ddba..f11b3a5ce82 100644 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/context/data/ClientConfigurationContextDataJSO.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/context/data/ClientConfigurationContextDataJSO.java @@ -69,4 +69,8 @@ public class ClientConfigurationContextDataJSO extends JavaScriptObject { public final native String getSailingAnalyticsImageURL() /*-{ return this.sailingAnalyticsImageURL; }-*/; + + public final native String getSailingAnalyticsReadMoreText() /*-{ + return this.sailingAnalyticsReadMoreText; + }-*/; } \ No newline at end of file diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/shared/ClientConfiguration.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/shared/ClientConfiguration.java index c04759d9d26..f3d894dbeca 100644 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/shared/ClientConfiguration.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/shared/ClientConfiguration.java @@ -32,6 +32,11 @@ import com.sap.sse.gwt.client.context.impl.ClientConfigurationContextDataFactory *
  • corresponding variable must be declared and filled with the appropriate value in {@link ClientConfigurationFilter}
    • *
  • class {@link ClientConfigurationContextDataJSO} must be extended with an getter for the new field
    • * + *

    + * + * Methods accepting an {@link Optional} locale parameter are used to support internationalization of the branding information in + * the back-end. GWT clients can use {@link Optional#empty()} and will get an internationalized value because the back-end will + * have handled the client's locale information. * * @see ClientConfigurationContextScriptGenerator * @@ -64,6 +69,7 @@ public class ClientConfiguration implements BrandingConfiguration { private String sailingSimulatorTrimmedImageURL; private String buoyPingerAppImageURL; private String sailingAnalyticsImageURL; + private String sailingAnalyticsReadMoreText; public ClientConfiguration() { try { @@ -82,6 +88,7 @@ public class ClientConfiguration implements BrandingConfiguration { sailingSimulatorTrimmedImageURL = dataJso.getSailingSimulatorTrimmedImageURL(); buoyPingerAppImageURL = dataJso.getBuoyPingerAppImageURL(); sailingAnalyticsImageURL = dataJso.getSailingAnalyticsImageURL(); + sailingAnalyticsReadMoreText = dataJso.getSailingAnalyticsReadMoreText(); } catch (RuntimeException e) { GWT.log("no branding information found."); } @@ -156,4 +163,8 @@ public class ClientConfiguration implements BrandingConfiguration { public String getSailingAnalyticsImageURL() { return sailingAnalyticsImageURL; } + + public String getSailingAnalyticsReadMoreText(Optional locale) { + return sailingAnalyticsReadMoreText; + } } diff --git a/java/com.sap.sse.replication/src/com/sap/sse/replication/impl/ReplicationReceiverImpl.java b/java/com.sap.sse.replication/src/com/sap/sse/replication/impl/ReplicationReceiverImpl.java index faef22a7393..ff443157042 100755 --- a/java/com.sap.sse.replication/src/com/sap/sse/replication/impl/ReplicationReceiverImpl.java +++ b/java/com.sap.sse.replication/src/com/sap/sse/replication/impl/ReplicationReceiverImpl.java @@ -36,7 +36,6 @@ import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; import com.sap.sse.common.mail.MailException; import com.sap.sse.i18n.ResourceBundleStringMessages; -import com.sap.sse.i18n.impl.ResourceBundleStringMessagesImpl; import com.sap.sse.operationaltransformation.Operation; import com.sap.sse.replication.FullyInitializedReplicableTracker; import com.sap.sse.replication.OperationWithResult; @@ -362,7 +361,7 @@ public class ReplicationReceiverImpl implements ReplicationReceiver, Runnable { } private void sendMailAboutShutdownSignalException(ShutdownSignalException sse) { - final ResourceBundleStringMessages stringMessages = new ResourceBundleStringMessagesImpl(STRING_MESSAGES_BASE_NAME, getClass().getClassLoader(), StandardCharsets.UTF_8.name()); + final ResourceBundleStringMessages stringMessages = ResourceBundleStringMessages.create(STRING_MESSAGES_BASE_NAME, getClass().getClassLoader(), StandardCharsets.UTF_8.name()); final SecurityService securityService = getSecurityService(); if (securityService == null) { logger.warning("No security service available; cannot send mail about shutdown signal exception"); diff --git a/java/com.sap.sse.security.datamining/src/com/sap/sse/security/datamining/Activator.java b/java/com.sap.sse.security.datamining/src/com/sap/sse/security/datamining/Activator.java index ed33e4ed424..7267ce26b2b 100644 --- a/java/com.sap.sse.security.datamining/src/com/sap/sse/security/datamining/Activator.java +++ b/java/com.sap.sse.security.datamining/src/com/sap/sse/security/datamining/Activator.java @@ -12,7 +12,6 @@ import com.sap.sse.datamining.components.AggregationProcessorDefinition; import com.sap.sse.datamining.components.DataRetrieverChainDefinition; import com.sap.sse.datamining.impl.AbstractDataMiningActivator; import com.sap.sse.i18n.ResourceBundleStringMessages; -import com.sap.sse.i18n.impl.ResourceBundleStringMessagesImpl; import com.sap.sse.security.datamining.data.HasPermissionOfUserContext; import com.sap.sse.security.datamining.data.HasPermissionOfUserInUserGroupContext; import com.sap.sse.security.datamining.data.HasPreferenceOfUserContext; @@ -51,7 +50,7 @@ public class Activator extends AbstractDataMiningActivator { public Activator() { dataRetrieverChainDefinitions = new SecurityDataRetrievalChainDefinitions(); - sailingServerStringMessages = new ResourceBundleStringMessagesImpl(STRING_MESSAGES_BASE_NAME, getClassLoader(), + sailingServerStringMessages = ResourceBundleStringMessages.create(STRING_MESSAGES_BASE_NAME, getClassLoader(), StandardCharsets.UTF_8.name()); } diff --git a/java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java b/java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java index 268631c1cb9..2b155162d39 100755 --- a/java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java +++ b/java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java @@ -102,7 +102,7 @@ import com.sap.sse.common.mail.MailException; import com.sap.sse.common.media.TakedownNoticeRequestContext; import com.sap.sse.concurrent.LockUtil; import com.sap.sse.concurrent.NamedReentrantReadWriteLock; -import com.sap.sse.i18n.impl.ResourceBundleStringMessagesImpl; +import com.sap.sse.i18n.ResourceBundleStringMessages; import com.sap.sse.mail.MailService; import com.sap.sse.replication.ReplicationService; import com.sap.sse.replication.interfaces.impl.AbstractReplicableWithObjectInputStream; @@ -218,7 +218,7 @@ implements ReplicableSecurityService, ClearStateTestSupport { private SecurityManager securityManager; private static final String STRING_MESSAGES_BASE_NAME = "stringmessages/StringMessages"; - private static final ResourceBundleStringMessagesImpl messages = new ResourceBundleStringMessagesImpl( + private static final ResourceBundleStringMessages messages = ResourceBundleStringMessages.create( SecurityServiceImpl.STRING_MESSAGES_BASE_NAME, SecurityServiceImpl.class.getClassLoader(), StandardCharsets.UTF_8.name()); diff --git a/java/com.sap.sse.test/src/com/sap/sse/test/TestTakedownNoticeFactory.java b/java/com.sap.sse.test/src/com/sap/sse/test/TestTakedownNoticeFactory.java index 42c9a95d455..e2def30dcc2 100644 --- a/java/com.sap.sse.test/src/com/sap/sse/test/TestTakedownNoticeFactory.java +++ b/java/com.sap.sse.test/src/com/sap/sse/test/TestTakedownNoticeFactory.java @@ -11,7 +11,6 @@ import org.junit.jupiter.api.Test; import com.sap.sse.common.media.NatureOfClaim; import com.sap.sse.common.media.TakedownNoticeRequestContext; import com.sap.sse.i18n.ResourceBundleStringMessages; -import com.sap.sse.i18n.impl.ResourceBundleStringMessagesImpl; import com.sap.sse.util.TakedownNoticeFactory; public class TestTakedownNoticeFactory { @@ -20,7 +19,7 @@ public class TestTakedownNoticeFactory { private ResourceBundleStringMessages getTestStringMessages() { if (TEST_STRING_MESSAGES == null) { - TEST_STRING_MESSAGES = new ResourceBundleStringMessagesImpl(TEST_STRING_MESSAGES_BASE_NAME, + TEST_STRING_MESSAGES = ResourceBundleStringMessages.create(TEST_STRING_MESSAGES_BASE_NAME, TestTakedownNoticeFactory.class.getClassLoader(), StandardCharsets.UTF_8.name()); } return TEST_STRING_MESSAGES; diff --git a/java/com.sap.sse/src/com/sap/sse/i18n/ResourceBundleStringMessages.java b/java/com.sap.sse/src/com/sap/sse/i18n/ResourceBundleStringMessages.java index 5df290596f8..718f665156d 100644 --- a/java/com.sap.sse/src/com/sap/sse/i18n/ResourceBundleStringMessages.java +++ b/java/com.sap.sse/src/com/sap/sse/i18n/ResourceBundleStringMessages.java @@ -9,6 +9,7 @@ import java.util.ResourceBundle; import java.util.ResourceBundle.Control; import com.sap.sse.i18n.impl.NullResourceBundleStringMessages; +import com.sap.sse.i18n.impl.ResourceBundleStringMessagesImpl; /** * Allow server-side internationalization similar to GWT client-side by using property files. @@ -27,6 +28,14 @@ import com.sap.sse.i18n.impl.NullResourceBundleStringMessages; */ public interface ResourceBundleStringMessages { static final ResourceBundleStringMessages NULL = new NullResourceBundleStringMessages(); + + static ResourceBundleStringMessages create(String resourceBaseName, ClassLoader resourceClassLoader, String encoding) { + return new ResourceBundleStringMessagesImpl(resourceBaseName, resourceClassLoader, encoding); + } + + static ResourceBundleStringMessages create(String resourceBaseName, ClassLoader resourceClassLoader) { + return new ResourceBundleStringMessagesImpl(resourceBaseName, resourceClassLoader); + } String getResourceBaseName(); diff --git a/java/com.sap.sse/src/com/sap/sse/i18n/impl/ResourceBundleStringMessagesImpl.java b/java/com.sap.sse/src/com/sap/sse/i18n/impl/ResourceBundleStringMessagesImpl.java index 52fb3981df2..8a3200a67a4 100644 --- a/java/com.sap.sse/src/com/sap/sse/i18n/impl/ResourceBundleStringMessagesImpl.java +++ b/java/com.sap.sse/src/com/sap/sse/i18n/impl/ResourceBundleStringMessagesImpl.java @@ -2,6 +2,7 @@ package com.sap.sse.i18n.impl; import java.nio.charset.StandardCharsets; import java.util.Locale; +import java.util.MissingResourceException; import java.util.ResourceBundle; import java.util.ResourceBundle.Control; import java.util.regex.Matcher; @@ -14,6 +15,7 @@ public class ResourceBundleStringMessagesImpl implements ResourceBundleStringMes private final String resourceBaseName; private final ClassLoader resourceClassLoader; private String encoding; + private ResourceBundle result; public ResourceBundleStringMessagesImpl(String resourceBaseName, ClassLoader resourceClassLoader, String encoding) { this.resourceBaseName = resourceBaseName; @@ -100,12 +102,18 @@ public class ResourceBundleStringMessagesImpl implements ResourceBundleStringMes } private ResourceBundle getResourceBundle(Locale locale) { - Control controller = Util.createControl(encoding); - if (resourceClassLoader != null) { - return ResourceBundle.getBundle(resourceBaseName, locale, resourceClassLoader, controller); - } else { - return ResourceBundle.getBundle(resourceBaseName, locale, controller); + final Control controller = Util.createControl(encoding); + try { + if (resourceClassLoader != null) { + result = ResourceBundle.getBundle(resourceBaseName, locale, resourceClassLoader, controller); + } else { + result = ResourceBundle.getBundle(resourceBaseName, locale, controller); + } + } catch (MissingResourceException e) { + // try again with default locale + return getResourceBundle(Locale.getDefault()); } + return result; } @Override diff --git a/translation_v2.json b/translation_v2.json index 7065b720012..02c3b311b35 100755 --- a/translation_v2.json +++ b/translation_v2.json @@ -86,6 +86,24 @@ } ] }, + { + "collectionName":"SAPBranding", + "folders":[ + { + "startingFolderPath":"java/com.sap.sse.branding.sap/resources/stringmessages", + "sourceFilters":[ + "**/SAPBrandingStringMessages*.properties" + ], + "excludedSourceFilters":[ + "**/*_zh.properties" + ], + "xlfFolderPath":"./XLF", + "targetFolderPath":".", + "pseudoLocFolderPath":"." + } + ] + }, + { { "collectionName":"SecurityDataMining", "folders":[