From 6f1958e0c01509eab38cb7741378eb1c391d69e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 6 Jun 2020 13:53:42 +0000
Subject: [PATCH 1/2] Bump websocket-extensions from 0.1.3 to 0.1.4

Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4.
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 20be7c9..6eb0aa0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7117,9 +7117,9 @@ websocket-driver@>=0.5.1:
     websocket-extensions ">=0.1.1"
 
 websocket-extensions@>=0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
-  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
+  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
 
 which-module@^1.0.0:
   version "1.0.0"

From 257a29ecd1a5c7350dc06f887707d0d80341932f Mon Sep 17 00:00:00 2001
From: "tien.xuan.vo" <tien.xuan.vo@gmail.com>
Date: Sat, 7 Nov 2020 10:42:29 +0700
Subject: [PATCH 2/2] Fix translation key

---
 templates/Admin/_other/notFound.html.twig | 6 +++---
 translations/messages.en.yml              | 4 ++--
 translations/messages.tr.yml              | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/templates/Admin/_other/notFound.html.twig b/templates/Admin/_other/notFound.html.twig
index 7959459..54e0a8f 100644
--- a/templates/Admin/_other/notFound.html.twig
+++ b/templates/Admin/_other/notFound.html.twig
@@ -6,7 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
 
     {# Meta #}
-    <title>{{ title('440_not_found'|trans) }}</title>
+    <title>{{ title('404_not_found'|trans) }}</title>
     <meta name="description" content="{{ bag.get('head_description') }}"/>
     <meta name="keywords" content="{{ bag.get('head_keywords') }}"/>
     <meta name="author" content="{{ bag.get('head_author') }}"/>
@@ -22,8 +22,8 @@
 {# Wrapper #}
 <section class="container align-self-center">
     <div class="d-flex flex-column text-center justify-content-center align-items-center">
-        <h2 class="mb-4">{{ '440_not_found'|trans }}</h2>
-        <p class="alert alert-danger border-0 mb-4">{{ '440_not_found_description'|trans }}</p>
+        <h2 class="mb-4">{{ '404_not_found'|trans }}</h2>
+        <p class="alert alert-danger border-0 mb-4">{{ '404_not_found_description'|trans }}</p>
         <p><a href="{{ path('admin_dashboard') }}">Go Home</a></p>
     </div>
 </section>
diff --git a/translations/messages.en.yml b/translations/messages.en.yml
index 6f012d4..4bb5337 100644
--- a/translations/messages.en.yml
+++ b/translations/messages.en.yml
@@ -132,8 +132,8 @@ remove_complete: Deletion completed.
 sorry_not_existing: Sorry no registration is available.
 test_email_success: Test email sent.
 user_registration_disable: User registration is currently closed, please try again later.
-440_not_found: 404 Page Not Found!
-440_not_found_description: Sorry, the page you were looking for could not be found or may be removed.
+404_not_found: Page Not Found!
+404_not_found_description: Sorry, the page you were looking for could not be found or may be removed.
 
 ###
 # Pages
diff --git a/translations/messages.tr.yml b/translations/messages.tr.yml
index 95faa8f..826d40b 100644
--- a/translations/messages.tr.yml
+++ b/translations/messages.tr.yml
@@ -132,8 +132,8 @@ remove_complete: Silme işlemi tamamlandı.
 sorry_not_existing: Üzgünüz kayıt mevcut değil.
 test_email_success: Test e-postası gönderildi.
 user_registration_disable: Kullanıcı kaydı şu anda kapalı, lütfen daha sonra tekrar deneyin.
-440_not_found: Sayfa Bulunamadı!
-440_not_found_description: Üzgünüz aradığınız sayfa bulunamadı veya kullanımdan kaldırılmış olabilir.
+404_not_found: Sayfa Bulunamadı!
+404_not_found_description: Üzgünüz aradığınız sayfa bulunamadı veya kullanımdan kaldırılmış olabilir.
 
 ###
 # Pages