Merge remote-tracking branch 'extensions_lang_english/REWRITE'

extensions/lang-english/.editorconfig

@@ -0,0 +1,19 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
+[*.{diff,md}]
+trim_trailing_whitespace = false
+
+[*.{php,xml,json}]
+indent_size = 4

extensions/lang-english/.gitattributes

@@ -0,0 +1,18 @@
+.gitattributes export-ignore
+.gitignore export-ignore
+.gitmodules export-ignore
+.github export-ignore
+.travis export-ignore
+.travis.yml export-ignore
+.editorconfig export-ignore
+.styleci.yml export-ignore
+
+phpunit.xml export-ignore
+tests export-ignore
+
+js/dist/* -diff
+js/dist/* linguist-generated
+js/dist-typings/* linguist-generated
+js/yarn.lock -diff
+
+* text=auto eol=lf

extensions/lang-english/.gitignore

@@ -0,0 +1,12 @@
+/vendor
+composer.lock
+composer.phar
+
+.DS_Store
+Thumbs.db
+tests/.phpunit.result.cache
+/tests/integration/tmp
+.vagrant
+.idea/*
+.vscode
+js/coverage-ts

extensions/lang-english/.styleci.yml

@@ -0,0 +1,14 @@
+preset: recommended
+
+enabled:
+  - logical_not_operators_with_successor_space
+
+disabled:
+  - align_double_arrow
+  - blank_line_after_opening_tag
+  - multiline_array_trailing_comma
+  - new_with_braces
+  - phpdoc_align
+  - phpdoc_order
+  - phpdoc_separation
+  - phpdoc_types

extensions/lang-english/CHANGELOG.md

@@ -0,0 +1,74 @@
+# Changelog
+
+## [1.2.0](https://github.com/flarum/embed/compare/v1.1.0...v1.2.0)
+
+No changes.
+
+## [1.1.0](https://github.com/flarum/embed/compare/v1.0.0...v1.1.0)
+
+No changes.
+
+## [1.0.0](https://github.com/flarum/lang-english/compare/v0.1.0-beta.16...v1.0.0)
+
+### Changed
+- Compatibility with Flarum v1.0.0.
+
+## [0.1.0-beta.16](https://github.com/flarum/lang-english/compare/v0.1.0-beta.15...v0.1.0-beta.16)
+
+### Added
+- Bypass tag requirement label (https://github.com/flarum/lang-english/pull/182)
+
+### Changed
+- Alphabetical order of strings (https://github.com/flarum/lang-english/pull/184)
+
+### Fixed
+- Typo in uninstall confirmation string (https://github.com/flarum/lang-english/pull/181)
+- Date format validation string (https://github.com/flarum/lang-english/pull/152)
+
+### Removed
+- Moved all translation strings to their respective extensions (https://github.com/flarum/lang-english/pull/175)
+
+## [0.1.0-beta.15](https://github.com/flarum/lang-english/compare/v0.1.0-beta.14.1...v0.1.0-beta.15)
+
+### Added
+- Keys for new admin interface (#176)
+- Keys for slug driver (#179)
+- Keys for flarum/nicknames (#178)
+
+### Fixes
+- Appearance title key references incorrect key (#180)
+
+## [0.1.0-beta.14.1](https://github.com/flarum/lang-english/compare/v0.1.0-beta.14...v0.1.0-beta.14.1)
+
+### Fixed
+- Missing translation keys for edited post (#163)
+
+## [0.1.0-beta.14](https://github.com/flarum/lang-english/compare/v0.1.0-beta.13...v0.1.0-beta.14)
+
+### Added
+- Keys for extension dependency errors (#172)
+- Keys for emails from flarum/mentions (#167)
+- Keys for emails from flarum/subscriptions (#168)
+- Key for password validation rule (#151)
+- Keys for email testing in the admin area (#156)
+- Key for all discussions meta title (#158)
+- Key for following page meta title (#159)
+- Keys for display name drivers (#166)
+
+### Changed
+- Quoted translated string that contains variable (#169)
+- Period added to stop line in validation messages (#170)
+
+### Removed
+- Keys for mandrill email driver
+- Keys for SES email driver
+
+## [0.1.0-beta.13](https://github.com/flarum/lang-english/compare/v0.1.0-beta.12...v0.1.0-beta.13)
+
+### Added
+- Keys for hidden permission groups (#153, flarum/core#2129, flarum/core#845)
+- Keys for post deletion confirmation (#162, flarum/core#2135)
+- Keys for HTML meta data (#154, flarum/tags#72)
+
+### Changed
+- Key in confirmation deletion modal of user (#157)

extensions/lang-english/LICENSE

@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2019-2021 Stichting Flarum (Flarum Foundation)
+Copyright (c) 2014-2019 Toby Zerner (toby.zerner@gmail.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

extensions/lang-english/README.md

@@ -0,0 +1,10 @@
+# English Language Pack for Flarum
+
+## Installation
+
+This language pack is bundled with [Flarum](http://flarum.org/).
+
+## Translating Flarum
+
+Because Flarum is at an early development stage, instructions to translate it are currently unavailable. 
+Please check [our documentation](http://docs.flarum.org) on the topic of translation when it will be written or consult [our community](https://discuss.flarum.org/t/i18n).

extensions/lang-english/composer.json

@@ -0,0 +1,53 @@
+{
+    "name": "flarum/lang-english",
+    "type": "flarum-extension",
+    "description": "English language pack.",
+    "keywords": [
+        "locale"
+    ],
+    "license": "MIT",
+    "require": {
+        "flarum/core": "^1.2"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.x-dev"
+        },
+        "flarum-extension": {
+            "title": "English",
+            "category": "language",
+            "info": {
+                "donate": "https://flarum.org/donate/",
+                "website": "https://flarum.org",
+                "support": "https://discuss.flarum.org"
+            },
+            "icon": {
+                "image": "icon.svg",
+                "backgroundColor": "#00247d",
+                "backgroundSize": "cover",
+                "backgroundPosition": "center"
+            }
+        },
+        "flarum-locale": {
+            "code": "en",
+            "title": "English"
+        },
+        "flarum-cli": {
+            "modules": {
+                "admin": false,
+                "forum": false,
+                "js": false,
+                "jsCommon": false,
+                "css": false,
+                "gitConf": true,
+                "githubActions": false,
+                "prettier": false,
+                "typescript": false,
+                "bundlewatch": false,
+                "backendTesting": false,
+                "editorConfig": true,
+                "styleci": true
+            }
+        }
+    }
+}

extensions/lang-english/extend.php

@@ -0,0 +1,10 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
+return new Flarum\Extend\LanguagePack();

extensions/lang-english/icon.svg

@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 30" width="1200" height="600">
+  <clipPath id="a">
+    <path d="M30 15h30v15zv15H0zH0V0zV0h30z"/>
+  </clipPath>
+  <path d="M0 0v30h60V0z" fill="#00247d"/>
+  <path d="M0 0l60 30m0-30L0 30" stroke="#fff" stroke-width="6"/>
+  <path d="M0 0l60 30m0-30L0 30" clip-path="url(#a)" stroke="#cf142b" stroke-width="4"/>
+  <path d="M30 0v30M0 15h60" stroke="#fff" stroke-width="10"/>
+  <path d="M30 0v30M0 15h60" stroke="#cf142b" stroke-width="6"/>
+</svg>