Updated i18n

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. If macro related, sample macro code '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**TokenTool Info**
+- Version: 1.5.?
+- Install: New, Upgrade [previous version], or JAR [Java Version]
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. Windows, Linux [Ubuntu, Debian, CentOS, etc], MacOS]
+ - Version [10, 18.04, etc.]
+
+**Additional context**
+Add any other context about the problem here.
+You can also attach files (drag and drop here or paste from clipboard) such as log files or screenshots. For large files, paste a file sharing link.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/submit-a-question.md

@@ -0,0 +1,12 @@
+---
+name: Submit a Question
+about: Technical Questions
+
+---
+
+**Describe your question**
+A clear and concise question regarding this Project, how to contribute, or similar topics.
+
+*This should NOT be used for general questions on use of TokenTool*
+For user support, please post your question on the Forums: http://forums.rptools.net
+Or on our Discord channel: [Invite Link](https://discord.gg/2FCwhZ9)

.github/no-response.yml

@@ -1,7 +1,7 @@
 # Configuration for probot-no-response - https://github.com/probot/no-response
 
 # Number of days of inactivity before an Issue is closed for lack of response
-daysUntilClose: 30
+daysUntilClose: 90
 # Label requiring a response
 responseRequiredLabel: info needed
 # Comment to post when closing an Issue for lack of response. Set to `false` to disable

.travis.yml

@@ -30,20 +30,18 @@ deploy:
     repo: $REPO
     tags: true
     all_branches: true
-notifications:
-  webhooks:
-    on_success:
-      - wget $TRAVIS_DISCORD_WEBHOOK_SCRIPT_URL
-      - chmod +x send.sh
-      - ./send.sh success $DISCORD_URL
-    on_failure:
-      - wget $TRAVIS_DISCORD_WEBHOOK_SCRIPT_URL
-      - chmod +x send.sh
-      - ./send.sh failure $DISCORD_URL
 after_deploy:
   # Finalize Sentry release
   - sentry-cli releases finalize "$TRAVIS_TAG"
   # Associate commits with the Sentry release
   - sentry-cli releases set-commits "$TRAVIS_TAG" --auto
   # Tell Sentry.io we have deployed a release
   - sentry-cli releases deploys "$TRAVIS_TAG" new -e Production
+after_success:
+  - wget $TRAVIS_DISCORD_WEBHOOK_SCRIPT_URL
+  - chmod +x send.sh
+  - ./send.sh success $DISCORD_URL
+after_failure:
+  - wget $TRAVIS_DISCORD_WEBHOOK_SCRIPT_URL
+  - chmod +x send.sh
+  - ./send.sh failure $DISCORD_URL

src/main/java/net/rptools/tokentool/AppSetup.java

@@ -103,6 +103,7 @@ private static void confirmInstallOverlays(int overlaysInstalled) {
     Platform.runLater(
         () -> {
           Alert alert = new Alert(AlertType.INFORMATION);
+          alert.setHeaderText(I18N.getString("TokenTool.dialog.confirmation.header"));
           alert.setTitle(I18N.getString("AppSetup.dialog.install.overlays.confirmation.title"));
           alert.setContentText(
               overlaysInstalled

src/main/java/net/rptools/tokentool/client/TokenTool.java

@@ -103,7 +103,7 @@ public void init() throws Exception {
     // Log some basic info
     log.info("Environment: " + Sentry.getStoredClient().getEnvironment());
     if (!Sentry.getStoredClient().getEnvironment().toLowerCase().equals("production"))
-      log.info("Not in Produciton mode and thus will not log any events to Sentry.io");
+      log.info("Not in Production mode and thus will not log any events to Sentry.io");
 
     log.info("Release: " + Sentry.getStoredClient().getRelease());
     log.info("OS: " + ThreadContext.get("OS"));

src/main/java/net/rptools/tokentool/controller/ManageOverlays_Controller.java

@@ -318,6 +318,7 @@ else if (overlayFiles.size() == 1) {
     }
 
     Alert alert = new Alert(AlertType.CONFIRMATION);
+    alert.setHeaderText(I18N.getString("TokenTool.dialog.confirmation.header"));
     alert.setTitle(I18N.getString("ManageOverlays.dialog.delete.title"));
     alert.setContentText(confirmationText);
 
@@ -347,6 +348,7 @@ private boolean confirmDelete(File dir) {
     }
 
     Alert alert = new Alert(AlertType.CONFIRMATION);
+    alert.setHeaderText(I18N.getString("TokenTool.dialog.confirmation.header"));
     alert.setTitle(I18N.getString("ManageOverlays.dialog.delete.dir.title"));
     alert.setContentText(confirmationText);
 
@@ -417,6 +419,7 @@ void addOverlayButton_onAction(ActionEvent event) {
   @FXML
   void addFolderButton_onAction(ActionEvent event) {
     TextInputDialog dialog = new TextInputDialog();
+    dialog.setHeaderText(I18N.getString("TokenTool.dialog.confirmation.header"));
     dialog.setTitle(I18N.getString("ManageOverlays.filechooser.folder.title"));
     dialog.setContentText(I18N.getString("ManageOverlays.filechooser.folder.content_text"));
 
@@ -433,6 +436,7 @@ void addFolderButton_onAction(ActionEvent event) {
   @FXML
   void restoreButton_onAction(ActionEvent event) {
     Alert alert = new Alert(AlertType.CONFIRMATION);
+    alert.setHeaderText(I18N.getString("TokenTool.dialog.confirmation.header"));
     alert.setTitle(I18N.getString("ManageOverlays.dialog.restore.overlays.title"));
     alert.setContentText(I18N.getString("ManageOverlays.dialog.restore.overlays.content_text"));
 

src/main/java/net/rptools/tokentool/controller/TokenTool_Controller.java

@@ -767,6 +767,7 @@ void helpResetMenu_OnAction(ActionEvent event) {
     String confirmationText = I18N.getString("TokenTool.dialog.reset.confirmation.text");
 
     Alert alert = new Alert(AlertType.CONFIRMATION);
+    alert.setHeaderText(I18N.getString("TokenTool.dialog.confirmation.header"));
     alert.setTitle(I18N.getString("TokenTool.dialog.reset.confirmation.title"));
     alert.setContentText(confirmationText);
 
@@ -1140,7 +1141,7 @@ void backgroundMenuItem_OnAction(ActionEvent event) {
   @FXML
   void portraitMenuItem_OnAction(ActionEvent event) {
     String menuText = ((RadioMenuItem) event.getSource()).getText();
-    layerMenuButton.setText(menuText + " Layer"); // TODO: i18n this shit
+    layerMenuButton.setText(menuText + I18N.getString("controls.layers.menu.layer.text"));
     portraitMenuItem.setSelected(true);
   }
 
@@ -1822,8 +1823,12 @@ public Slider getOverlayTransparencySlider() {
   }
 
   public void exitApplication() {
-    // Lets update the recent list to current overlay...
-    updateOverlayTreeViewRecentFolder(true);
+    try {
+      // Lets update the recent list to current overlay...
+      updateOverlayTreeViewRecentFolder(true);
+    } catch (NullPointerException npe) {
+      log.info("Unable to updateOverlayTreeViewRecentFolder on exit.");
+    }
 
     try {
       AppPreferences.savePreferences(this);

src/main/java/net/rptools/tokentool/util/ImageUtil.java

@@ -394,9 +394,10 @@ private static boolean isMagenta(Color color, int fudge) {
 
   public static String getFileType(File imageFile) {
     if (FilenameUtils.getExtension(imageFile.getName()).toLowerCase().equals("psd")) {
-      return "Adobe Photoshop Image";
+      return "Adobe Photoshop " + I18N.getString("imageUtil.filetype.label.image");
     } else {
-      return FilenameUtils.getExtension(imageFile.getName()).toUpperCase() + " File";
+      return FilenameUtils.getExtension(imageFile.getName()).toUpperCase()
+          + I18N.getString("imageUtil.filetype.label.extension");
     }
   }
 
@@ -424,12 +425,24 @@ public static byte[] imageToBytes(BufferedImage image, String format) throws IOE
   public static final List<ExtensionFilter> GET_EXTENSION_FILTERS() {
     List<ExtensionFilter> extensionFilters = new ArrayList<ExtensionFilter>();
     extensionFilters.add(
-        new ExtensionFilter("All Images", "*.psd", "*.png", "*.gif", "*.jpg", "*.jpeg", "*.bmp"));
-    extensionFilters.add(new ExtensionFilter("PSD Files", "*.psd"));
-    extensionFilters.add(new ExtensionFilter("PNG Files", "*.png"));
-    extensionFilters.add(new ExtensionFilter("JPG Files", "*.jpg"));
-    extensionFilters.add(new ExtensionFilter("JPEG Files", "*.jpeg"));
-    extensionFilters.add(new ExtensionFilter("BMP Files", "*.bmp"));
+        new ExtensionFilter(
+            I18N.getString("imageUtil.filetype.label.all_images"),
+            "*.psd",
+            "*.png",
+            "*.gif",
+            "*.jpg",
+            "*.jpeg",
+            "*.bmp"));
+    extensionFilters.add(
+        new ExtensionFilter("PSD" + I18N.getString("imageUtil.filetype.label.files"), "*.psd"));
+    extensionFilters.add(
+        new ExtensionFilter("PNG" + I18N.getString("imageUtil.filetype.label.files"), "*.png"));
+    extensionFilters.add(
+        new ExtensionFilter("JPG" + I18N.getString("imageUtil.filetype.label.files"), "*.jpg"));
+    extensionFilters.add(
+        new ExtensionFilter("JPEG" + I18N.getString("imageUtil.filetype.label.files"), "*.jpeg"));
+    extensionFilters.add(
+        new ExtensionFilter("BMP" + I18N.getString("imageUtil.filetype.label.files"), "*.bmp"));
 
     return extensionFilters;
   }

src/main/resources/net/rptools/tokentool/i18n/TokenTool.properties

@@ -35,6 +35,7 @@ PdvViewer.stage.title = Select PDF
 
 RegionSelector.button.Capture = Capture
 
+TokenTool.dialog.confirmation.header            = Confirmation
 TokenTool.dialog.reset.confirmation.text        = This will reset all saved UI settings back to default, are you sure?
 TokenTool.dialog.reset.confirmation.title       = Reset Settings?
 TokenTool.openBackgroundImage.filechooser.title = Select Image
@@ -68,6 +69,11 @@ controls.useTokenNameCheckbox.text       = Use Token Name +
 controls.use_background.text             = Use Background Options
 controls.use_background.tooltip          = Save Portrait using Background Image and Background Color is they are set. This will force the Portrait to be saved as a .jpg image.
 
+imageUtil.filetype.label.all_images = All Images
+imageUtil.filetype.label.extension  = \ File
+imageUtil.filetype.label.files      = \ Files
+imageUtil.filetype.label.image      = Image
+
 menu.title.edit                 = _Edit
 menu.title.edit.capture.screen  = Capture _Screen
 menu.title.edit.copy.image      = _Copy Image