fix automoderator lang + CRLF

.github/workflows/frontend.yml

@@ -1,13 +1,13 @@
-name: FrontEnd
-
-on: [workflow_dispatch, push]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@master
-      - uses: flarum/action-build@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+name: FrontEnd
+
+on: [workflow_dispatch, push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@master
+      - uses: flarum/action-build@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,2 +1,2 @@
-node_modules/
-vendor/
+node_modules/
+vendor/

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 AntoineFr
+Copyright (c) 2022 AntoineFr
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -2,7 +2,7 @@
 
 Give money to your users for different actions.
 
-**This extension is compatible with Flarum 1.0**
+**This extension is compatible with Flarum >= 1.0**
 
 ## Installation
 ```

composer.json

@@ -1,37 +1,37 @@
-{
-    "name": "antoinefr/flarum-ext-money",
-    "description": "Give money to your users for different actions.",
-    "type": "flarum-extension",
-    "license": "MIT",
-    "support": {
-        "forum": "https://discuss.flarum.org/d/4699-money-extension",
-        "issues": "https://github.com/AntoineFr/flarum-ext-money/issues",
-        "source": "https://github.com/AntoineFr/flarum-ext-money"
-    },
-    "require": {
-        "flarum/core": "^1.0"
-    },
-    "require-dev": {
-        "squizlabs/php_codesniffer": "3.*"
-    },
-    "autoload": {
-        "psr-4": {
-            "AntoineFr\\Money\\": "src/"
-        }
-    },
-    "extra": {
-        "flarum-extension": {
-            "title": "Money",
-            "category": "feature",
-            "icon": {
-                "name": "fas fa-money-bill",
-                "backgroundColor": "#FFD700",
-                "color": "#85bb65"
-            },
-            "optional-dependencies": [
-                "flarum/likes",
-                "askvortsov/flarum-auto-moderator"
-            ]
-        }
-    }
-}
+{
+    "name": "antoinefr/flarum-ext-money",
+    "description": "Give money to your users for different actions.",
+    "type": "flarum-extension",
+    "license": "MIT",
+    "support": {
+        "forum": "https://discuss.flarum.org/d/4699-money-extension",
+        "issues": "https://github.com/AntoineFr/flarum-ext-money/issues",
+        "source": "https://github.com/AntoineFr/flarum-ext-money"
+    },
+    "require": {
+        "flarum/core": "^1.0"
+    },
+    "require-dev": {
+        "squizlabs/php_codesniffer": "3.*"
+    },
+    "autoload": {
+        "psr-4": {
+            "AntoineFr\\Money\\": "src/"
+        }
+    },
+    "extra": {
+        "flarum-extension": {
+            "title": "Money",
+            "category": "feature",
+            "icon": {
+                "name": "fas fa-money-bill",
+                "backgroundColor": "#FFD700",
+                "color": "#85bb65"
+            },
+            "optional-dependencies": [
+                "flarum/likes",
+                "askvortsov/flarum-auto-moderator"
+            ]
+        }
+    }
+}

js/admin.js

@@ -1 +1 @@
-export * from './src/admin';
+export * from './src/admin';

js/forum.js

@@ -1 +1 @@
-export * from './src/forum';
+export * from './src/forum';

js/package.json

@@ -1,13 +1,13 @@
-{
-  "private": true,
-  "name": "@antoinefr/flarum-ext-money",
-  "devDependencies": {
-    "flarum-webpack-config": "^2.0.0",
-    "webpack": "^5.65.0",
-    "webpack-cli": "^4.9.1"
-  },
-  "scripts": {
-    "dev": "webpack --mode development --watch",
-    "build": "webpack --mode production"
-  }
-}
+{
+  "private": true,
+  "name": "@antoinefr/flarum-ext-money",
+  "devDependencies": {
+    "flarum-webpack-config": "^2.0.0",
+    "webpack": "^5.65.0",
+    "webpack-cli": "^4.9.1"
+  },
+  "scripts": {
+    "dev": "webpack --mode development --watch",
+    "build": "webpack --mode production"
+  }
+}

js/webpack.config.js

@@ -1 +1 @@
-module.exports = require('flarum-webpack-config')();
+module.exports = require('flarum-webpack-config')();

locale/en.yml

@@ -1,23 +1,23 @@
-antoinefr-money:
-  admin:
-    settings:
-      title: Settings
-      moneyforpost: Money given for a new post
-      moneyfordiscussion: Money given for a new discussion
-      moneyname: "Name of the money (ex: [money] points)"
-      postminimumlength: Post minimum length to get the money (0 to disable)
-      noshowzero: Do not show if the value is zero
-      moneyforlike: Money given when a post is liked
-      helpextensionlikes: Requires the <code>flarum/likes</code> extension
-    permissions:
-      edit_money_label: Edit money
-  forum:
-    user_controls:
-      money_button: Edit money
-    modal:
-      title: "{username}'s money"
-      current: "Current:"
-      submit_button: => core.ref.save_changes
-  automoderator:
-    metric_name: Money
-    action_name: Give money
+antoinefr-money:
+  admin:
+    settings:
+      title: Settings
+      moneyforpost: Money given for a new post
+      moneyfordiscussion: Money given for a new discussion
+      moneyname: "Name of the money (ex: [money] points)"
+      postminimumlength: Post minimum length to get the money (0 to disable)
+      noshowzero: Do not show if the value is zero
+      moneyforlike: Money given when a post is liked
+      helpextensionlikes: Requires the <code>flarum/likes</code> extension
+    permissions:
+      edit_money_label: Edit money
+    automoderator:
+      metric_name: Money
+      action_name: Give money
+  forum:
+    user_controls:
+      money_button: Edit money
+    modal:
+      title: "{username}'s money"
+      current: "Current:"
+      submit_button: => core.ref.save_changes

locale/fr.yml

@@ -1,23 +1,23 @@
-antoinefr-money:
-  admin:
-    settings:
-      title: Paramètres
-      moneyforpost: Monnaie donnée pour un nouveau post
-      moneyfordiscussion: Monnaie donnée pour une nouvelle discussion
-      moneyname: "Nom de la monnaie (ex: [money] points)"
-      postminimumlength: Taille minimale du post pour gagner la monnaie (0 pour désactiver)
-      noshowzero: Ne pas afficher si la valeur est 0
-      moneyforlike: Monnaie donnée quand un post est aimé
-      helpextensionlikes: Nécessite l'extension <code>flarum/likes</code>
-    permissions:
-      edit_money_label: Modifier la monnaie
-  forum:
-    user_controls:
-      money_button: Modifier la monnaie
-    modal:
-      title: "Monnaie de {username}"
-      current: "Actuellement :"
-      submit_button: => core.ref.save_changes
-  automoderator:
-    metric_name: Monnaie
-    action_name: Donner la monnaie
+antoinefr-money:
+  admin:
+    settings:
+      title: Paramètres
+      moneyforpost: Monnaie donnée pour un nouveau post
+      moneyfordiscussion: Monnaie donnée pour une nouvelle discussion
+      moneyname: "Nom de la monnaie (ex: [money] points)"
+      postminimumlength: Taille minimale du post pour gagner la monnaie (0 pour désactiver)
+      noshowzero: Ne pas afficher si la valeur est 0
+      moneyforlike: Monnaie donnée quand un post est aimé
+      helpextensionlikes: Nécessite l'extension <code>flarum/likes</code>
+    permissions:
+      edit_money_label: Modifier la monnaie
+    automoderator:
+      metric_name: Monnaie
+      action_name: Donner la monnaie
+  forum:
+    user_controls:
+      money_button: Modifier la monnaie
+    modal:
+      title: "Monnaie de {username}"
+      current: "Actuellement :"
+      submit_button: => core.ref.save_changes

src/AutoModerator/Action/Money.php

@@ -12,13 +12,13 @@ class Money implements ActionDriverInterface
 {
     public function translationKey(): string
     {
-        return 'antoinefr-money.automoderator.action_name';
+        return 'antoinefr-money.admin.automoderator.action_name';
     }
 
     public function availableSettings(): array
     {
         return [
-            'money' => 'antoinefr-money.automoderator.metric_name',
+            'money' => 'antoinefr-money.admin.automoderator.metric_name',
         ];
     }
 

src/AutoModerator/Metric/Money.php

@@ -10,7 +10,7 @@ class Money implements MetricDriverInterface
 {
     public function translationKey(): string
     {
-        return 'antoinefr-money.automoderator.metric_name';
+        return 'antoinefr-money.admin.automoderator.metric_name';
     }
 
     public function extensionDependencies(): array