mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-04 03:13:49 +00:00
added i18n suppor tfor AdminConsole version display
Change-Id: Ibfa10707a346eba99adcc161c72bc4c7acfe8a02
This commit is contained in:
1 parent
0a18d0881b
commit
286adfd3b6
7 files changed
+15
-9
No files matched your search
+1
-1
@@ -83,7 +83,7 @@ public class AdminConsoleEntryPoint extends AbstractSailingEntryPoint implements
|
||||
|
||||
private Widget createAdminConsolePanel() {
|
||||
AdminConsolePanel panel = new AdminConsolePanel(getUserService(), SailingPermissionsForRoleProvider.INSTANCE,
|
||||
sailingService, getStringMessages().releaseNotes(), "/release_notes_admin.html", /* error reporter */ this, SecurityStylesheetResources.INSTANCE.css());
|
||||
sailingService, getStringMessages().releaseNotes(), "/release_notes_admin.html", /* error reporter */ this, SecurityStylesheetResources.INSTANCE.css(), getStringMessages());
|
||||
panel.addStyleName("adminConsolePanel");
|
||||
|
||||
BetterDateTimeBox.initialize();
|
||||
|
||||
+1
@@ -1760,4 +1760,5 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages,
|
||||
String errorLoadingCompetitorImportDescriptors(String message);
|
||||
String couldNotSaveCompetitorRegistrations(String message);
|
||||
String searchTagForImportedCompetitorPlaceholder();
|
||||
String version(String version);
|
||||
}
|
||||
+2
-1
@@ -1731,4 +1731,5 @@ filterImportedCompetitorsByNameSailRaceFleet=Filter competitors to import by nam
|
||||
errorLoadingCompetitorImportProviders=Error loading competitor import providers: {0}
|
||||
errorLoadingCompetitorImportDescriptors=Error loading competitor import descriptors: {0}
|
||||
couldNotSaveCompetitorRegistrations=Could not save competitor registrations: {0}
|
||||
searchTagForImportedCompetitorPlaceholder=Use, e.g., the race+fleet name
|
||||
searchTagForImportedCompetitorPlaceholder=Use, e.g., the race+fleet name
|
||||
version=Version: {0}
|
||||
+2
-1
@@ -1716,4 +1716,5 @@ filterImportedCompetitorsByNameSailRaceFleet=Zu importierende Teilnehmer filtern
|
||||
errorLoadingCompetitorImportProviders=Fehler beim Laden der Quellen für den Teilnehmerdaten-Import: {0}
|
||||
errorLoadingCompetitorImportDescriptors=Fehler beim Laden der zu importierenden Teilnehmerdaten: {0}
|
||||
couldNotSaveCompetitorRegistrations=Teilnehmerregistrierung konnte nicht gespeichert werden: {0}
|
||||
searchTagForImportedCompetitorPlaceholder=Z.B. Renn- und Gruppenname
|
||||
searchTagForImportedCompetitorPlaceholder=Z.B. Renn- und Gruppenname
|
||||
version=Version: {0}
|
||||
+2
-2
@@ -152,7 +152,7 @@ public class AdminConsolePanel extends DockLayoutPanel implements HandleTabSelec
|
||||
|
||||
public AdminConsolePanel(UserService userService, PermissionsForRoleProvider permissionsForRoleProvider,
|
||||
ServerInfoRetriever buildVersionRetriever, String releaseNotesAnchorLabel,
|
||||
String releaseNotesURL, ErrorReporter errorReporter, LoginPanelCss loginPanelCss) {
|
||||
String releaseNotesURL, ErrorReporter errorReporter, LoginPanelCss loginPanelCss, StringMessages stringMessages) {
|
||||
super(Unit.EM);
|
||||
this.permissionsForRoleProvider = permissionsForRoleProvider;
|
||||
this.permissionsAnyOfWhichIsRequiredToSeeWidget = new HashMap<>();
|
||||
@@ -206,7 +206,7 @@ public class AdminConsolePanel extends DockLayoutPanel implements HandleTabSelec
|
||||
informationPanel.setSize("100%", "95%");
|
||||
informationPanel.setSpacing(10);
|
||||
informationPanel.add(errorReporter.getPersistentInformationWidget(), DockPanel.CENTER);
|
||||
SystemInformationPanel sysinfoPanel = new SystemInformationPanel(buildVersionRetriever, errorReporter);
|
||||
SystemInformationPanel sysinfoPanel = new SystemInformationPanel(buildVersionRetriever, errorReporter, stringMessages);
|
||||
sysinfoPanel.ensureDebugId("SystemInformation");
|
||||
final Anchor releaseNotesLink = new Anchor(new SafeHtmlBuilder().appendEscaped(releaseNotesAnchorLabel).toSafeHtml(), releaseNotesURL);
|
||||
sysinfoPanel.add(releaseNotesLink);
|
||||
|
||||
@@ -18,4 +18,8 @@ public interface StringMessages extends Messages {
|
||||
String pleaseOnlyUploadContentYouHaveAllUsageRightsFor();
|
||||
|
||||
String send();
|
||||
|
||||
String version(String buildVersion);
|
||||
|
||||
String unknown();
|
||||
}
|
||||
+3
-4
@@ -13,19 +13,19 @@ public class SystemInformationPanel extends FlowPanel {
|
||||
|
||||
private final Label buildVersionText;
|
||||
|
||||
public SystemInformationPanel(final ServerInfoRetriever buildVersionRetriever, final ErrorReporter errorReporter) {
|
||||
public SystemInformationPanel(final ServerInfoRetriever buildVersionRetriever, final ErrorReporter errorReporter, final StringMessages stringMessages) {
|
||||
super();
|
||||
buildVersionText = new Label("");
|
||||
addFloatingWidget(buildVersionText);
|
||||
buildVersionRetriever.getServerInfo(new AsyncCallback<ServerInfoDTO>() {
|
||||
@Override
|
||||
public void onSuccess(ServerInfoDTO result) {
|
||||
buildVersionText.setText("Version: " + result.getBuildVersion());
|
||||
buildVersionText.setText(stringMessages.version(result.getBuildVersion()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFailure(Throwable caught) {
|
||||
buildVersionText.setText("Version: " + "Unknown");
|
||||
buildVersionText.setText(stringMessages.version(stringMessages.unknown()));
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -34,5 +34,4 @@ public class SystemInformationPanel extends FlowPanel {
|
||||
w.getElement().getStyle().setFloat(Style.Float.LEFT);
|
||||
add(w);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user