diff --git a/cr-core/src/main/java/org/terasology/crashreporter/GlobalProperties.java b/cr-core/src/main/java/org/terasology/crashreporter/GlobalProperties.java index 7c7cade..3a52259 100644 --- a/cr-core/src/main/java/org/terasology/crashreporter/GlobalProperties.java +++ b/cr-core/src/main/java/org/terasology/crashreporter/GlobalProperties.java @@ -15,7 +15,6 @@ public final class GlobalProperties { private final Properties properties = new Properties(); public enum KEY { - SUPPORT_FORUM_LINK, JOIN_DISCORD_LINK, REPORT_ISSUE_LINK, @@ -32,7 +31,6 @@ public enum KEY { RES_FINAL_TITLE_IMAGE, RES_UPLOAD_TITLE_IMAGE, RES_GITHUB_ICON, - RES_FORUM_ICON, RES_DISCORD_ICON } diff --git a/cr-core/src/main/java/org/terasology/crashreporter/pages/FinalActionsPanel.java b/cr-core/src/main/java/org/terasology/crashreporter/pages/FinalActionsPanel.java index ebacd35..37caf2b 100644 --- a/cr-core/src/main/java/org/terasology/crashreporter/pages/FinalActionsPanel.java +++ b/cr-core/src/main/java/org/terasology/crashreporter/pages/FinalActionsPanel.java @@ -97,21 +97,6 @@ public void actionPerformed(ActionEvent e) { githubIssueButton.setToolTipText(properties.get(KEY.REPORT_ISSUE_LINK)); gridPanel.add(githubIssueButton); - JButton forumButton = new JButton(I18N.getMessage("gotoForum")); - forumButton.setIcon(Resources.loadIcon(properties.get(KEY.RES_FORUM_ICON))); - forumButton.setFont(buttonFont); - forumButton.addActionListener(new ActionListener() { - - @Override - public void actionPerformed(ActionEvent e) { - openInBrowser(properties.get(KEY.SUPPORT_FORUM_LINK)); - pageComplete = true; - firePropertyChange("pageComplete", !pageComplete, pageComplete); - } - }); - forumButton.setToolTipText(properties.get(KEY.SUPPORT_FORUM_LINK)); - gridPanel.add(forumButton); - add(gridPanel, BorderLayout.CENTER); // -------- link text ------- diff --git a/cr-core/src/main/resources/crashreporter_defaults.properties b/cr-core/src/main/resources/crashreporter_defaults.properties index a430772..217574f 100644 --- a/cr-core/src/main/resources/crashreporter_defaults.properties +++ b/cr-core/src/main/resources/crashreporter_defaults.properties @@ -10,4 +10,3 @@ RES_FINAL_TITLE_IMAGE=icons/Actions-irc-voice-icon.png RES_UPLOAD_TITLE_IMAGE=icons/Arrow-up-icon.png RES_GITHUB_ICON=icons/github.png RES_DISCORD_ICON=icons/discord.png -RES_FORUM_ICON=icons/forum.png diff --git a/cr-core/src/main/resources/i18n/MessagesBundle.properties b/cr-core/src/main/resources/i18n/MessagesBundle.properties index b6bef9f..c86c13e 100644 --- a/cr-core/src/main/resources/i18n/MessagesBundle.properties +++ b/cr-core/src/main/resources/i18n/MessagesBundle.properties @@ -21,7 +21,6 @@ waitForUpload=Uploading file - please wait ... uploadComplete=Paste uploaded to uploadFailed=Upload failed uploadDialog=Upload to Pastebin -gotoForum=Go to Support Forum next=Next prev=Previous copyToClipboard=Copy to clipboard diff --git a/cr-core/src/main/resources/i18n/MessagesBundle_de.properties b/cr-core/src/main/resources/i18n/MessagesBundle_de.properties index 7da7766..d9769f2 100644 --- a/cr-core/src/main/resources/i18n/MessagesBundle_de.properties +++ b/cr-core/src/main/resources/i18n/MessagesBundle_de.properties @@ -14,7 +14,6 @@ waitForUpload=Datei wird hochgeladen - bitte warten ... uploadComplete=Paste hochgeladen auf uploadFailed=Upload fehlgeschlagen uploadDialog=Upload auf Pastebin -gotoForum=Zum Support Forum next=Weiter prev=Zur\u00FCck viewLog=Log-Datei diff --git a/cr-core/src/main/resources/i18n/MessagesBundle_es.properties b/cr-core/src/main/resources/i18n/MessagesBundle_es.properties index 274ccba..6402d86 100644 --- a/cr-core/src/main/resources/i18n/MessagesBundle_es.properties +++ b/cr-core/src/main/resources/i18n/MessagesBundle_es.properties @@ -17,7 +17,6 @@ waitForUpload=Carga de archivos en curso - gracias por esperar ... uploadComplete=Subidos a uploadFailed= uploadDialog= -gotoForum= next=Siguiente prev=Anterior copyToClipboard= diff --git a/cr-core/src/main/resources/i18n/MessagesBundle_fr.properties b/cr-core/src/main/resources/i18n/MessagesBundle_fr.properties index a56d63f..d1e98e4 100644 --- a/cr-core/src/main/resources/i18n/MessagesBundle_fr.properties +++ b/cr-core/src/main/resources/i18n/MessagesBundle_fr.properties @@ -17,7 +17,6 @@ fileLocation=Emplacement uploadLog2=Transf\u00E9rer le fichier journal noUpload=Vous n'avez pas encore transf\u00E9r\u00E9 le fichier journal noUploadLinkText=Pas de fichier transf\u00E9r\u00E9 -gotoForum=Aller au forum de support next=Suivant prev=Pr\u00E9c\u00E9dent copyToClipboard=Copier dans le presse-papiers diff --git a/cr-core/src/main/resources/i18n/MessagesBundle_gl.properties b/cr-core/src/main/resources/i18n/MessagesBundle_gl.properties index 1a8a72d..50264ac 100644 --- a/cr-core/src/main/resources/i18n/MessagesBundle_gl.properties +++ b/cr-core/src/main/resources/i18n/MessagesBundle_gl.properties @@ -17,7 +17,6 @@ fileLocation=Localizaci\u00F3n uploadLog2=Subir ficheiro de rexistro noUpload=A\u00EDnda non subiches o ficheiro de rexistro noUploadLinkText=Non se subiu ning\u00FAn ficheiro -gotoForum=Ir ao Foro de Soporte next=Seguinte prev=Anterior copyToClipboard=Colar ao portapapeis diff --git a/cr-core/src/main/resources/i18n/MessagesBundle_it.properties b/cr-core/src/main/resources/i18n/MessagesBundle_it.properties index 2af1cb9..eb5cee2 100644 --- a/cr-core/src/main/resources/i18n/MessagesBundle_it.properties +++ b/cr-core/src/main/resources/i18n/MessagesBundle_it.properties @@ -14,7 +14,6 @@ uploadDialog=Carica il file su Pastebin uploadLog2=Carica log file noUpload=Devi ancora caricare un log file noUploadLinkText=Nessun file caricato -gotoForum=Vai al Forum di supporto next=Seguente prev=Precedente copyToClipboard=Copia su appunti diff --git a/cr-core/src/main/resources/i18n/MessagesBundle_ja.properties b/cr-core/src/main/resources/i18n/MessagesBundle_ja.properties index a1a6f36..545d3bf 100644 --- a/cr-core/src/main/resources/i18n/MessagesBundle_ja.properties +++ b/cr-core/src/main/resources/i18n/MessagesBundle_ja.properties @@ -17,7 +17,6 @@ fileLocation=\u5834\u6240 uploadLog2=\u30ED\u30B0\u3092\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9 noUpload=\u30ED\u30B0\u3092\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9\u3057\u307E\u305B\u3093\u3067\u3057\u305F noUploadLinkText=\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u306F\u3042\u308A\u307E\u305B\u3093 -gotoForum=\u30B5\u30DD\u30FC\u30C8\u30D5\u30A9\u30FC\u30E9\u30E0\u3092\u958B\u304F next=\u6B21\u3078 prev=\u524D\u3078 copyToClipboard=\u30AF\u30EA\u30C3\u30D7\u30DC\u30FC\u30C9\u306B\u30B3\u30D4\u30FC diff --git a/cr-core/src/main/resources/i18n/MessagesBundle_pl.properties b/cr-core/src/main/resources/i18n/MessagesBundle_pl.properties index e279aca..79ab475 100644 --- a/cr-core/src/main/resources/i18n/MessagesBundle_pl.properties +++ b/cr-core/src/main/resources/i18n/MessagesBundle_pl.properties @@ -17,7 +17,6 @@ fileLocation=Lokalizacja uploadLog2=Wy\u015Blij plik dziennika noUpload=Nie wys\u0142a\u0142e\u015B jeszcze pliku dziennika noUploadLinkText=Nie wys\u0142ano pliku -gotoForum=Id\u017A na forum wsparcia next=Dalej prev=Wstecz copyToClipboard=Kopiuj do schowka diff --git a/cr-core/src/main/resources/i18n/MessagesBundle_pt.properties b/cr-core/src/main/resources/i18n/MessagesBundle_pt.properties index 7e89ca3..49b3394 100644 --- a/cr-core/src/main/resources/i18n/MessagesBundle_pt.properties +++ b/cr-core/src/main/resources/i18n/MessagesBundle_pt.properties @@ -17,7 +17,6 @@ waitForUpload=Uploading file - please wait ... uploadComplete=Paste uploaded to uploadFailed=Upload failed uploadDialog=Upload to Pastebin -gotoForum=Go to Support Forum next=Next prev=Previous copyToClipboard=Copy to clipboard diff --git a/cr-core/src/main/resources/i18n/MessagesBundle_tr.properties b/cr-core/src/main/resources/i18n/MessagesBundle_tr.properties index c83787f..127a260 100644 --- a/cr-core/src/main/resources/i18n/MessagesBundle_tr.properties +++ b/cr-core/src/main/resources/i18n/MessagesBundle_tr.properties @@ -17,7 +17,6 @@ waitForUpload=Dosya y\u00FCkleniyor - l\u00FCtfen bekleyin ... uploadComplete=Yap\u0131\u015Ft\u0131rma y\u00FCkleme uploadFailed=Y\u00FCkleme ba\u015Far\u0131s\u0131z uploadDialog=Pastebin'e y\u00FCkle -gotoForum=Destek forumuna git next=\u0130leri prev=Geri copyToClipboard=Panoya kopyala diff --git a/cr-core/src/main/resources/icons/forum.png b/cr-core/src/main/resources/icons/forum.png deleted file mode 100644 index 2910000..0000000 Binary files a/cr-core/src/main/resources/icons/forum.png and /dev/null differ diff --git a/cr-destsol/src/main/resources/crashreporter.properties b/cr-destsol/src/main/resources/crashreporter.properties index d4ea105..4dbc676 100644 --- a/cr-destsol/src/main/resources/crashreporter.properties +++ b/cr-destsol/src/main/resources/crashreporter.properties @@ -1,4 +1,3 @@ -SUPPORT_FORUM_LINK=http://forum.terasology.org/forum/destination-sol.57/ REPORT_ISSUE_LINK=https://github.com/MovingBlocks/DestinationSol/issues/new JOIN_IRC_LINK=https://webchat.freenode.net/?channels=destination-sol diff --git a/cr-terasology/src/main/resources/crashreporter.properties b/cr-terasology/src/main/resources/crashreporter.properties index 47a7a74..d75d927 100644 --- a/cr-terasology/src/main/resources/crashreporter.properties +++ b/cr-terasology/src/main/resources/crashreporter.properties @@ -1,4 +1,3 @@ -SUPPORT_FORUM_LINK=http://forum.terasology.org/forum/support.20/ REPORT_ISSUE_LINK=https://github.com/MovingBlocks/Terasology/issues/new JOIN_DISCORD_LINK=https://discord.gg/terasology