Merge branch 'dev' into lang/new-lang-russian

.gitlab/scripts/sort.py

@@ -44,6 +44,7 @@ def main():
             if (
                 "_incomplete" not in file
                 and file != "en_EN.json"
+                and file != "humanized_index.json"
                 and file.endswith(".json")
             ):
                 file_path = os.path.join(root, file)

CHANGELOG.md

@@ -26,10 +26,11 @@ TBD
 - Remove text from status page and use symbols ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/770))
 - Add better feedback on when errors appear on user creation ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/763))
 - Workaround cpu_freq call catching on obscure cpu architectures ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/776))
+- Change Role selector in server wizard to be a filter list ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/772))
 ### Lang
 - Show natural language name instead of country code in User Config Lang select list ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/773))
-- Add remaining `he_IL`, `th_TH` translations for 4.4.0 Release ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/761))
+- Add remaining `he_IL`, `th_TH` translations from 4.4.0 Release ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/761))
-- Mark `he_IL` incomplete ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/763))
+- Fix `fr_FR` syntax issues ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/780) | [Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/778))
 <br><br>
 
 ## --- [4.4.0] - 2024/05/11

app/classes/web/routes/api/roles/index.py

@@ -11,6 +11,7 @@ create_role_schema = {
         "name": {
             "type": "string",
             "minLength": 1,
+            "pattern": r"^[^,\[\]]*$",
         },
         "servers": {
             "type": "array",
@@ -23,7 +24,7 @@ create_role_schema = {
                     },
                     "permissions": {
                         "type": "string",
-                        "pattern": "^[01]{8}$",  # 8 bits, see EnumPermissionsServer
+                        "pattern": r"^[01]{8}$",  # 8 bits, see EnumPermissionsServer
                     },
                 },
                 "required": ["server_id", "permissions"],

app/classes/web/routes/api/roles/role/index.py

@@ -10,6 +10,7 @@ modify_role_schema = {
         "name": {
             "type": "string",
             "minLength": 1,
+            "pattern": r"^[^,\[\]]*$",
         },
         "servers": {
             "type": "array",
@@ -22,7 +23,7 @@ modify_role_schema = {
                     },
                     "permissions": {
                         "type": "string",
-                        "pattern": "^[01]{8}$",  # 8 bits, see EnumPermissionsServer
+                        "pattern": r"^[01]{8}$",  # 8 bits, see EnumPermissionsServer
                     },
                 },
                 "required": ["server_id", "permissions"],

app/frontend/static/assets/css/crafty.css

@@ -278,6 +278,9 @@ div.warnings div.wssError a:hover {
 }
 
 /**************************************************************/
+.dropdown-menu {
+    max-width: 100%;
+}
 
 .hidden-input {
     margin-left: -40px;

app/frontend/static/assets/css/vendors/bootstrap-select-1.13.18.css

@@ -0,0 +1,537 @@
+/*!
+ * Bootstrap-select v1.13.18 (https://developer.snapappointments.com/bootstrap-select)
+ *
+ * Copyright 2012-2020 SnapAppointments, LLC
+ * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
+ */
+@-webkit-keyframes bs-notify-fadeOut {
+    0% {
+        opacity: .9
+    }
+
+    100% {
+        opacity: 0
+    }
+}
+
+@-o-keyframes bs-notify-fadeOut {
+    0% {
+        opacity: .9
+    }
+
+    100% {
+        opacity: 0
+    }
+}
+
+@keyframes bs-notify-fadeOut {
+    0% {
+        opacity: .9
+    }
+
+    100% {
+        opacity: 0
+    }
+}
+
+.bootstrap-select>select.bs-select-hidden,
+select.bs-select-hidden,
+select.selectpicker {
+    display: none !important
+}
+
+.bootstrap-select {
+    width: 220px;
+    vertical-align: middle
+}
+
+.bootstrap-select>.dropdown-toggle {
+    position: relative;
+    width: 100%;
+    text-align: right;
+    white-space: nowrap;
+    display: -webkit-inline-box;
+    display: -webkit-inline-flex;
+    display: -ms-inline-flexbox;
+    display: inline-flex;
+    -webkit-box-align: center;
+    -webkit-align-items: center;
+    -ms-flex-align: center;
+    align-items: center;
+    -webkit-box-pack: justify;
+    -webkit-justify-content: space-between;
+    -ms-flex-pack: justify;
+    justify-content: space-between
+}
+
+.bootstrap-select>.dropdown-toggle:after {
+    margin-top: -1px
+}
+
+.bootstrap-select>.dropdown-toggle.bs-placeholder,
+.bootstrap-select>.dropdown-toggle.bs-placeholder:active,
+.bootstrap-select>.dropdown-toggle.bs-placeholder:focus,
+.bootstrap-select>.dropdown-toggle.bs-placeholder:hover {
+    color: #999
+}
+
+.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger,
+.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger:active,
+.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger:focus,
+.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger:hover,
+.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark,
+.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark:active,
+.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark:focus,
+.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark:hover,
+.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info,
+.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info:active,
+.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info:focus,
+.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info:hover,
+.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary,
+.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary:active,
+.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary:focus,
+.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary:hover,
+.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary,
+.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary:active,
+.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary:focus,
+.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary:hover,
+.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success,
+.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success:active,
+.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success:focus,
+.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success:hover {
+    color: rgba(255, 255, 255, .5)
+}
+
+.bootstrap-select>select {
+    position: absolute !important;
+    bottom: 0;
+    left: 50%;
+    display: block !important;
+    width: .5px !important;
+    height: 100% !important;
+    padding: 0 !important;
+    opacity: 0 !important;
+    border: none;
+    z-index: 0 !important
+}
+
+.bootstrap-select>select.mobile-device {
+    top: 0;
+    left: 0;
+    display: block !important;
+    width: 100% !important;
+    z-index: 2 !important
+}
+
+.bootstrap-select.is-invalid .dropdown-toggle,
+.error .bootstrap-select .dropdown-toggle,
+.has-error .bootstrap-select .dropdown-toggle,
+.was-validated .bootstrap-select select:invalid+.dropdown-toggle {
+    border-color: #b94a48
+}
+
+.bootstrap-select.is-valid .dropdown-toggle,
+.was-validated .bootstrap-select select:valid+.dropdown-toggle {
+    border-color: #28a745
+}
+
+.bootstrap-select.fit-width {
+    width: auto !important
+}
+
+.bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn) {
+    width: 220px
+}
+
+.bootstrap-select .dropdown-toggle:focus,
+.bootstrap-select>select.mobile-device:focus+.dropdown-toggle {
+    outline: thin dotted #333 !important;
+    outline: 5px auto -webkit-focus-ring-color !important;
+    outline-offset: -2px
+}
+
+.bootstrap-select.form-control {
+    margin-bottom: 0;
+    padding: 0;
+    border: none;
+    height: auto
+}
+
+:not(.input-group)>.bootstrap-select.form-control:not([class*=col-]) {
+    width: 100%
+}
+
+.bootstrap-select.form-control.input-group-btn {
+    float: none;
+    z-index: auto
+}
+
+.form-inline .bootstrap-select,
+.form-inline .bootstrap-select.form-control:not([class*=col-]) {
+    width: auto
+}
+
+.bootstrap-select:not(.input-group-btn),
+.bootstrap-select[class*=col-] {
+    float: none;
+    display: inline-block;
+    margin-left: 0
+}
+
+.bootstrap-select.dropdown-menu-right,
+.bootstrap-select[class*=col-].dropdown-menu-right,
+.row .bootstrap-select[class*=col-].dropdown-menu-right {
+    float: right
+}
+
+.form-group .bootstrap-select,
+.form-horizontal .bootstrap-select,
+.form-inline .bootstrap-select {
+    margin-bottom: 0
+}
+
+.form-group-lg .bootstrap-select.form-control,
+.form-group-sm .bootstrap-select.form-control {
+    padding: 0
+}
+
+.form-group-lg .bootstrap-select.form-control .dropdown-toggle,
+.form-group-sm .bootstrap-select.form-control .dropdown-toggle {
+    height: 100%;
+    font-size: inherit;
+    line-height: inherit;
+    border-radius: inherit
+}
+
+.bootstrap-select.form-control-lg .dropdown-toggle,
+.bootstrap-select.form-control-sm .dropdown-toggle {
+    font-size: inherit;
+    line-height: inherit;
+    border-radius: inherit
+}
+
+.bootstrap-select.form-control-sm .dropdown-toggle {
+    padding: .25rem .5rem
+}
+
+.bootstrap-select.form-control-lg .dropdown-toggle {
+    padding: .5rem 1rem
+}
+
+.form-inline .bootstrap-select .form-control {
+    width: 100%
+}
+
+.bootstrap-select.disabled,
+.bootstrap-select>.disabled {
+    cursor: not-allowed
+}
+
+.bootstrap-select.disabled:focus,
+.bootstrap-select>.disabled:focus {
+    outline: 0 !important
+}
+
+.bootstrap-select.bs-container {
+    position: absolute;
+    top: 0;
+    left: 0;
+    height: 0 !important;
+    padding: 0 !important
+}
+
+.bootstrap-select.bs-container .dropdown-menu {
+    z-index: 1060
+}
+
+.bootstrap-select .dropdown-toggle .filter-option {
+    position: static;
+    top: 0;
+    left: 0;
+    float: left;
+    height: 100%;
+    width: 100%;
+    text-align: left;
+    overflow: hidden;
+    -webkit-box-flex: 0;
+    -webkit-flex: 0 1 auto;
+    -ms-flex: 0 1 auto;
+    flex: 0 1 auto
+}
+
+.bs3.bootstrap-select .dropdown-toggle .filter-option {
+    padding-right: inherit
+}
+
+.input-group .bs3-has-addon.bootstrap-select .dropdown-toggle .filter-option {
+    position: absolute;
+    padding-top: inherit;
+    padding-bottom: inherit;
+    padding-left: inherit;
+    float: none
+}
+
+.input-group .bs3-has-addon.bootstrap-select .dropdown-toggle .filter-option .filter-option-inner {
+    padding-right: inherit
+}
+
+.bootstrap-select .dropdown-toggle .filter-option-inner-inner {
+    overflow: hidden
+}
+
+.bootstrap-select .dropdown-toggle .filter-expand {
+    width: 0 !important;
+    float: left;
+    opacity: 0 !important;
+    overflow: hidden
+}
+
+.bootstrap-select .dropdown-toggle .caret {
+    position: absolute;
+    top: 50%;
+    right: 12px;
+    margin-top: -2px;
+    vertical-align: middle
+}
+
+.input-group .bootstrap-select.form-control .dropdown-toggle {
+    border-radius: inherit
+}
+
+.bootstrap-select[class*=col-] .dropdown-toggle {
+    width: 100%
+}
+
+.bootstrap-select .dropdown-menu {
+    min-width: 100%;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box
+}
+
+.bootstrap-select .dropdown-menu>.inner:focus {
+    outline: 0 !important
+}
+
+.bootstrap-select .dropdown-menu.inner {
+    position: static;
+    float: none;
+    border: 0;
+    padding: 0;
+    margin: 0;
+    border-radius: 0;
+    -webkit-box-shadow: none;
+    box-shadow: none
+}
+
+.bootstrap-select .dropdown-menu li {
+    position: relative
+}
+
+.bootstrap-select .dropdown-menu li.active small {
+    color: rgba(255, 255, 255, .5) !important
+}
+
+.bootstrap-select .dropdown-menu li.disabled a {
+    cursor: not-allowed
+}
+
+.bootstrap-select .dropdown-menu li a {
+    cursor: pointer;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none
+}
+
+.bootstrap-select .dropdown-menu li a.opt {
+    position: relative;
+    padding-left: 2.25em
+}
+
+.bootstrap-select .dropdown-menu li a span.check-mark {
+    display: none
+}
+
+.bootstrap-select .dropdown-menu li a span.text {
+    display: inline-block
+}
+
+.bootstrap-select .dropdown-menu li small {
+    padding-left: .5em
+}
+
+.bootstrap-select .dropdown-menu .notify {
+    position: absolute;
+    bottom: 5px;
+    width: 96%;
+    margin: 0 2%;
+    min-height: 26px;
+    padding: 3px 5px;
+    background: #f5f5f5;
+    border: 1px solid #e3e3e3;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
+    box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
+    pointer-events: none;
+    opacity: .9;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box
+}
+
+.bootstrap-select .dropdown-menu .notify.fadeOut {
+    -webkit-animation: .3s linear 750ms forwards bs-notify-fadeOut;
+    -o-animation: .3s linear 750ms forwards bs-notify-fadeOut;
+    animation: .3s linear 750ms forwards bs-notify-fadeOut
+}
+
+.bootstrap-select .no-results {
+    padding: 3px;
+    background: #f5f5f5;
+    margin: 0 5px;
+    white-space: nowrap
+}
+
+.bootstrap-select.fit-width .dropdown-toggle .filter-option {
+    position: static;
+    display: inline;
+    padding: 0
+}
+
+.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner,
+.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner-inner {
+    display: inline
+}
+
+.bootstrap-select.fit-width .dropdown-toggle .bs-caret:before {
+    content: '\00a0'
+}
+
+.bootstrap-select.fit-width .dropdown-toggle .caret {
+    position: static;
+    top: auto;
+    margin-top: -1px
+}
+
+.bootstrap-select.show-tick .dropdown-menu .selected span.check-mark {
+    position: absolute;
+    display: inline-block;
+    right: 15px;
+    top: 5px
+}
+
+.bootstrap-select.show-tick .dropdown-menu li a span.text {
+    margin-right: 34px
+}
+
+.bootstrap-select .bs-ok-default:after {
+    content: '';
+    display: block;
+    width: .5em;
+    height: 1em;
+    border-style: solid;
+    border-width: 0 .26em .26em 0;
+    -webkit-transform-style: preserve-3d;
+    transform-style: preserve-3d;
+    -webkit-transform: rotate(45deg);
+    -ms-transform: rotate(45deg);
+    -o-transform: rotate(45deg);
+    transform: rotate(45deg)
+}
+
+.bootstrap-select.show-menu-arrow.open>.dropdown-toggle,
+.bootstrap-select.show-menu-arrow.show>.dropdown-toggle {
+    z-index: 1061
+}
+
+.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:before {
+    content: '';
+    border-left: 7px solid transparent;
+    border-right: 7px solid transparent;
+    border-bottom: 7px solid rgba(204, 204, 204, .2);
+    position: absolute;
+    bottom: -4px;
+    left: 9px;
+    display: none
+}
+
+.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:after {
+    content: '';
+    border-left: 6px solid transparent;
+    border-right: 6px solid transparent;
+    border-bottom: 6px solid #fff;
+    position: absolute;
+    bottom: -4px;
+    left: 10px;
+    display: none
+}
+
+.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:before {
+    bottom: auto;
+    top: -4px;
+    border-top: 7px solid rgba(204, 204, 204, .2);
+    border-bottom: 0
+}
+
+.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:after {
+    bottom: auto;
+    top: -4px;
+    border-top: 6px solid #fff;
+    border-bottom: 0
+}
+
+.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:before {
+    right: 12px;
+    left: auto
+}
+
+.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:after {
+    right: 13px;
+    left: auto
+}
+
+.bootstrap-select.show-menu-arrow.open>.dropdown-toggle .filter-option:after,
+.bootstrap-select.show-menu-arrow.open>.dropdown-toggle .filter-option:before,
+.bootstrap-select.show-menu-arrow.show>.dropdown-toggle .filter-option:after,
+.bootstrap-select.show-menu-arrow.show>.dropdown-toggle .filter-option:before {
+    display: block
+}
+
+.bs-actionsbox,
+.bs-donebutton,
+.bs-searchbox {
+    padding: 4px 8px
+}
+
+.bs-actionsbox {
+    width: 100%;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box
+}
+
+.bs-actionsbox .btn-group button {
+    width: 50%
+}
+
+.bs-donebutton {
+    float: left;
+    width: 100%;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box
+}
+
+.bs-donebutton .btn-group button {
+    width: 100%
+}
+
+.bs-searchbox+.bs-actionsbox {
+    padding: 0 8px 4px
+}
+
+.bs-searchbox .form-control {
+    margin-bottom: 0;
+    width: 100%;
+    float: none
+}

app/frontend/templates/server/bedrock_wizard.html

@@ -3,7 +3,7 @@
 {% block title %}Crafty Controller - {{ translate('serverWizard', 'newServer', data['lang']) }}{% end %}
 
 {% block content %}
-
+<link rel="stylesheet" href="../../static/assets/css/vendors/bootstrap-select-1.13.18.css">
 <div class="content-wrapper">
   <ul class="nav nav-pills tab-simple-styled " role="tablist">
     <li class="nav-item term-nav-item">
@@ -62,29 +62,24 @@
                 </div>
 
                 <div class="form-group">
-                  <div id="accordion-1">
+                  <p class="mb-0 p-0" aria-expanded="true">{{ translate('serverWizard', 'addRole', data['lang'])
-                    <div class="card">
+                    }}
-                      <div class="card-header p-2" id="Role-1">
+                    <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
-                        <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-1" aria-expanded="true"
+                      data['lang']) }}</small>
-                          aria-controls="collapseRole-1">
+                  </p>
-                          <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole', data['lang']) }}
+                  <select data-container="body"
-                          <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
+                    data-none-selected-text="{{ translate('serverWizard', 'noneRoles', data['lang']) }}"
-                            data['lang']) }}</small>
+                    data-none-results-text="{{ translate('serverWizard', 'noRole', data['lang']) }} {0}"
-                        </p>
+                    class="selectpicker form-control form-control-lg select-css roles_select"
-                      </div>
+                    data-styleBase="form-control" data-style="form-control" data-live-search="true" name="server_roles"
-                      <div id="collapseRole-1" class="collapse" aria-labelledby="Role-1" data-parent="">
+                    multiple>
-                        <div class="card-body scroll">
+                    {% for r in data['roles'] %}
-                          <div class="form-group">
+                    <option class="roles" type="checkbox" value="{{ r['role_id'] }}">
-                            {% for r in data['roles'] %}
+                      &nbsp; {{ r['role_name'].capitalize()
-                            <span class="d-block menu-option"><label><input name="{{ r['role_id'] }}"
+                      }}
-                                  type="checkbox">&nbsp;
+                    </option>
-                                {{ r['role_name'].capitalize() }}</label></span>
+                    {% end %}
-                            {% end %}
+                  </select>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                 </div>
                 <button onclick="eula_confirm()" type="button" class="btn btn-primary mr-2">{{ translate('serverWizard',
                   'buildServer',
@@ -146,30 +141,27 @@
               <input type="number" class="form-control" id="port2" name="port" value="19132" step="1" min="1"
                 max="65535" required>
             </div>
+
             <div class="form-group">
-              <div id="accordion-2">
+              <p class="mb-0 p-0" aria-expanded="true">{{ translate('serverWizard', 'addRole', data['lang'])
-                <div class="card">
+                }}
-                  <div class="card-header p-2" id="Role-2">
+                <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
-                    <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-2" aria-expanded="true"
+                  data['lang']) }}</small>
-                      aria-controls="collapseRole-2">
+              </p>
-                      <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole', data['lang']) }}
+              <select data-container="body"
-                      <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
+                data-none-selected-text="{{ translate('serverWizard', 'noneRoles', data['lang']) }}"
-                        data['lang']) }}</small>
+                data-none-results-text="{{ translate('serverWizard', 'noRole', data['lang']) }} {0}"
-                    </p>
+                class="selectpicker form-control form-control-lg select-css roles_select" data-styleBase="form-control"
-                  </div>
+                data-style="form-control" data-live-search="true" name="server_roles" multiple>
-                  <div id="collapseRole-2" class="collapse" aria-labelledby="Role-2" data-parent="">
+                {% for r in data['roles'] %}
-                    <div class="card-body scroll">
+                <option class="roles" type="checkbox" value="{{ r['role_id'] }}">
-                      <div class="form-group">
+                  &nbsp; {{ r['role_name'].capitalize()
-                        {% for r in data['roles'] %}
+                  }}
-                        <span class="d-block menu-option"><label><input name="{{ r['role_id'] }}" type="checkbox">&nbsp;
+                </option>
-                            {{ r['role_name'].capitalize() }}</label></span>
+                {% end %}
-                        {% end %}
+              </select>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
             </div>
+
             <button type="submit" class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton',
               data['lang']) }}</button>
             <button type="reset" class="btn btn-danger mr-2">{{ translate('serverWizard', 'resetForm', data['lang'])
@@ -222,29 +214,25 @@
               <input type="number" class="form-control" id="port3" name="port" value="19132" step="1" min="1"
                 max="65535" required>
             </div>
+
             <div class="form-group">
-              <div id="accordion-3">
+              <p class="mb-0 p-0" aria-expanded="true">{{ translate('serverWizard', 'addRole', data['lang'])
-                <div class="card">
+                }}
-                  <div class="card-header p-2" id="Role-3">
+                <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
-                    <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-3" aria-expanded="true"
+                  data['lang']) }}</small>
-                      aria-controls="collapseRole-3">
+              </p>
-                      <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole', data['lang'])
+              <select data-container="body"
-                      }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
+                data-none-selected-text="{{ translate('serverWizard', 'noneRoles', data['lang']) }}"
-                        data['lang']) }}</small>
+                data-none-results-text="{{ translate('serverWizard', 'noRole', data['lang']) }} {0}"
-                    </p>
+                class="selectpicker form-control form-control-lg select-css roles_select" data-styleBase="form-control"
-                  </div>
+                data-style="form-control" data-live-search="true" name="server_roles" multiple>
-                  <div id="collapseRole-3" class="collapse" aria-labelledby="Role-3" data-parent="">
+                {% for r in data['roles'] %}
-                    <div class="card-body scroll">
+                <option class="roles" type="checkbox" value="{{ r['role_id'] }}">
-                      <div class="form-group">
+                  &nbsp; {{ r['role_name'].capitalize()
-                        {% for r in data['roles'] %}
+                  }}
-                        <span class="d-block menu-option"><label><input name="{{ r['role_id'] }}" type="checkbox">&nbsp;
+                </option>
-                            {{ r['role_name'].capitalize() }}</label></span>
+                {% end %}
-                        {% end %}
+              </select>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
             </div>
             <div class="modal fade" id="dir_select" tabindex="-1" role="dialog" aria-labelledby="dir_select"
               aria-hidden="true">
@@ -348,30 +336,24 @@
               </div>
 
               <div class="form-group">
-                <div id="accordion-3">
+                <p class="mb-0 p-0" aria-expanded="true">{{ translate('serverWizard', 'addRole', data['lang'])
-                  <div class="card">
+                  }}
-                    <div class="card-header p-2" id="Role-3">
+                  <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
-                      <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-3" aria-expanded="true"
+                    data['lang']) }}</small>
-                        aria-controls="collapseRole-3">
+                </p>
-                        <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole',
+                <select data-container="body"
-                        data['lang'])
+                  data-none-selected-text="{{ translate('serverWizard', 'noneRoles', data['lang']) }}"
-                        }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
+                  data-none-results-text="{{ translate('serverWizard', 'noRole', data['lang']) }} {0}"
-                          data['lang']) }}</small>
+                  class="selectpicker form-control form-control-lg select-css roles_select"
-                      </p>
+                  data-styleBase="form-control" data-style="form-control" data-live-search="true" name="server_roles"
-                    </div>
+                  multiple>
-                    <div id="collapseRole-3" class="collapse" aria-labelledby="Role-3" data-parent="">
+                  {% for r in data['roles'] %}
-                      <div class="card-body scroll">
+                  <option class="roles" type="checkbox" value="{{ r['role_id'] }}">
-                        <div class="form-group">
+                    &nbsp; {{ r['role_name'].capitalize()
-                          {% for r in data['roles'] %}
+                    }}
-                          <span class="d-block menu-option"><label><input name="{{ r['role_id'] }}"
+                  </option>
-                                type="checkbox">&nbsp;
+                  {% end %}
-                              {{ r['role_name'].capitalize() }}</label></span>
+                </select>
-                          {% end %}
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
               </div>
               <div class="modal fade" id="dir_upload_select" tabindex="-1" role="dialog" aria-labelledby="dir_select"
                 aria-hidden="true">
@@ -587,17 +569,6 @@
 </script>
 
 <script>
-  function dropDown(event) {
-    event.target.parentElement.children[1].classList.remove("d-none");
-    document.getElementById("overlay").classList.remove("d-none");
-  }
-  function hide(event) {
-    var items = document.getElementsByClassName('menu');
-    for (let i = 0; i < items.length; i++) {
-      items[i].classList.add("d-none");
-    }
-    document.getElementById("overlay").classList.add("d-none");
-  }
 
   function wait_msg(importing) {
     bootbox.alert({
@@ -629,13 +600,15 @@
     }
   }
   function calcRoles() {
-    let role_ids = $('.roles').map(function () {
+    var combinedValues = [];
-      if ($(this).is(':checked')) {
+    $('.roles_select').each(function () {
-        return $(this).val();
+      var selectedValues = $(this).val();
+      console.log(selectedValues)
+      if (selectedValues) {
+        combinedValues = combinedValues.concat(selectedValues);
       }
-    }).get();
+    });
-    console.log(role_ids)
+    return combinedValues;
-    return role_ids
   }
   async function send_server(data) {
     let token = getCookie("_xsrf")
@@ -692,7 +665,6 @@
 
 
       console.log(formDataJsonString);
-
       send_server(formDataJsonString);
     });
 
@@ -810,4 +782,5 @@
   });
 </script>
 <script type="text/javascript" src="../../static/assets/js/shared/root-dir.js"></script>
+<script src="../../static/assets/js/shared/bootstrap-select-1.13.18.js"></script>
 {% end %}

app/frontend/templates/server/wizard.html

@@ -4,6 +4,7 @@
 
 {% block content %}
 
+<link rel="stylesheet" href="../../static/assets/css/vendors/bootstrap-select-1.13.18.css">
 <div class="content-wrapper">
   <ul class="nav nav-pills tab-simple-styled">
     <li class="nav-item term-nav-item">
@@ -152,30 +153,24 @@
                   </div>
                   <div class="col-sm-12">
                     <div class="form-group">
-                      <div id="accordion-1">
+                      <p class="mb-0 p-0" aria-expanded="true">{{ translate('serverWizard', 'addRole', data['lang'])
-                        <div class="card">
+                        }}
-                          <div class="card-header p-2" id="Role-1">
+                        <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
-                            <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-1"
+                          data['lang']) }}</small>
-                              aria-expanded="true" aria-controls="collapseRole-1">
+                      </p>
-                              <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole', data['lang'])
+                      <select data-container="body"
-                              }}
+                        data-none-selected-text="{{ translate('serverWizard', 'noneRoles', data['lang']) }}"
-                              <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
+                        data-none-results-text="{{ translate('serverWizard', 'noRole', data['lang']) }} {0}"
-                                data['lang']) }}</small>
+                        class="selectpicker form-control form-control-lg select-css roles_select"
-                            </p>
+                        data-styleBase="form-control" data-style="form-control" data-live-search="true"
-                          </div>
+                        name="server_roles" multiple>
-                          <div id="collapseRole-1" class="collapse" aria-labelledby="Role-1" data-parent="">
+                        {% for r in data['roles'] %}
-                            <div class="card-body scroll">
+                        <option class="roles" type="checkbox" value="{{ r['role_id'] }}">
-                              <div class="form-group">
+                          &nbsp; {{ r['role_name'].capitalize()
-                                {% for r in data['roles'] %}
+                          }}
-                                <span class="d-block menu-option"><label><input class="roles" name="{{ r['role_id'] }}"
+                        </option>
-                                      type="checkbox" value="{{ r['role_id'] }}">&nbsp; {{ r['role_name'].capitalize()
+                        {% end %}
-                                    }}</label></span>
+                      </select>
-                                {% end %}
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
                     </div>
                   </div>
 
@@ -285,29 +280,24 @@
               </div>
               <div class="col-sm-12">
                 <div class="form-group">
-                  <div id="accordion-2">
+                  <p class="mb-0 p-0" aria-expanded="true">{{ translate('serverWizard', 'addRole', data['lang'])
-                    <div class="card">
+                    }}
-                      <div class="card-header p-2" id="Role-2">
+                    <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
-                        <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-2" aria-expanded="true"
+                      data['lang']) }}</small>
-                          aria-controls="collapseRole-2">
+                  </p>
-                          <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole', data['lang']) }}
+                  <select data-container="body"
-                          <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
+                    data-none-selected-text="{{ translate('serverWizard', 'noneRoles', data['lang']) }}"
-                            data['lang']) }}</small>
+                    data-none-results-text="{{ translate('serverWizard', 'noRole', data['lang']) }} {0}"
-                        </p>
+                    class="selectpicker form-control form-control-lg select-css roles_select"
-                      </div>
+                    data-styleBase="form-control" data-style="form-control" data-live-search="true" name="server_roles"
-                      <div id="collapseRole-2" class="collapse" aria-labelledby="Role-2" data-parent="">
+                    multiple>
-                        <div class="card-body scroll">
+                    {% for r in data['roles'] %}
-                          <div class="form-group">
+                    <option class="roles" type="checkbox" value="{{ r['role_id'] }}">
-                            {% for r in data['roles'] %}
+                      &nbsp; {{ r['role_name'].capitalize()
-                            <span class="d-block menu-option"><label><input class="roles" name="{{ r['role_id'] }}"
+                      }}
-                                  type="checkbox" value="{{ r['role_id'] }}">&nbsp;
+                    </option>
-                                {{ r['role_name'].capitalize() }}</label></span>
+                    {% end %}
-                            {% end %}
+                  </select>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                 </div>
               </div>
             </div>
@@ -412,29 +402,24 @@
 
                 <div class="col-sm-12">
                   <div class="form-group">
-                    <div id="accordion-3">
+                    <p class="mb-0 p-0" aria-expanded="true">{{ translate('serverWizard', 'addRole', data['lang'])
-                      <div class="card">
+                      }}
-                        <div class="card-header p-2" id="Role-3">
+                      <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
-                          <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-3" aria-expanded="true"
+                        data['lang']) }}</small>
-                            aria-controls="collapseRole-3">
+                    </p>
-                            <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole', data['lang'])
+                    <select data-container="body"
-                            }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
+                      data-none-selected-text="{{ translate('serverWizard', 'noneRoles', data['lang']) }}"
-                              data['lang']) }}</small>
+                      data-none-results-text="{{ translate('serverWizard', 'noRole', data['lang']) }} {0}"
-                          </p>
+                      class="selectpicker form-control form-control-lg select-css roles_select"
-                        </div>
+                      data-styleBase="form-control" data-style="form-control" data-live-search="true"
-                        <div id="collapseRole-3" class="collapse" aria-labelledby="Role-3" data-parent="">
+                      name="server_roles" multiple>
-                          <div class="card-body scroll">
+                      {% for r in data['roles'] %}
-                            <div class="form-group">
+                      <option class="roles" type="checkbox" value="{{ r['role_id'] }}">
-                              {% for r in data['roles'] %}
+                        &nbsp; {{ r['role_name'].capitalize()
-                              <span class="d-block menu-option"><label><input class="roles" name="{{ r['role_id'] }}"
+                        }}
-                                    type="checkbox" value="{{ r['role_id'] }}">&nbsp;
+                      </option>
-                                  {{ r['role_name'].capitalize() }}</label></span>
+                      {% end %}
-                              {% end %}
+                    </select>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
                   </div>
                 </div>
                 <div class="modal fade" id="dir_select" tabindex="-1" role="dialog" aria-labelledby="dir_select"
@@ -558,30 +543,24 @@
               </div>
 
               <div class="form-group">
-                <div id="accordion-3">
+                <p class="mb-0 p-0" aria-expanded="true">{{ translate('serverWizard', 'addRole', data['lang'])
-                  <div class="card">
+                  }}
-                    <div class="card-header p-2" id="Role-3">
+                  <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
-                      <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-3" aria-expanded="true"
+                    data['lang']) }}</small>
-                        aria-controls="collapseRole-3">
+                </p>
-                        <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole',
+                <select data-container="body"
-                        data['lang'])
+                  data-none-selected-text="{{ translate('serverWizard', 'noneRoles', data['lang']) }}"
-                        }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
+                  data-none-results-text="{{ translate('serverWizard', 'noRole', data['lang']) }} {0}"
-                          data['lang']) }}</small>
+                  class="selectpicker form-control form-control-lg select-css roles_select"
-                      </p>
+                  data-styleBase="form-control" data-style="form-control" data-live-search="true" name="server_roles"
-                    </div>
+                  multiple>
-                    <div id="collapseRole-3" class="collapse" aria-labelledby="Role-3" data-parent="">
+                  {% for r in data['roles'] %}
-                      <div class="card-body scroll">
+                  <option class="roles" type="checkbox" value="{{ r['role_id'] }}">
-                        <div class="form-group">
+                    &nbsp; {{ r['role_name'].capitalize()
-                          {% for r in data['roles'] %}
+                    }}
-                          <span class="d-block menu-option"><label><input class="roles" name="{{ r['role_id'] }}"
+                  </option>
-                                type="checkbox" value="{{ r['role_id'] }}">&nbsp;
+                  {% end %}
-                              {{ r['role_name'].capitalize() }}</label></span>
+                </select>
-                          {% end %}
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
               </div>
               <div class="modal fade" id="dir_upload_select" tabindex="-1" role="dialog" aria-labelledby="dir_select"
                 aria-hidden="true">
@@ -863,13 +842,15 @@
     }
   }
   function calcRoles() {
-    let role_ids = $('.roles').map(function () {
+    var combinedValues = [];
-      if ($(this).is(':checked')) {
+    $('.roles_select').each(function () {
-        return $(this).val();
+      var selectedValues = $(this).val();
+      console.log(selectedValues)
+      if (selectedValues) {
+        combinedValues = combinedValues.concat(selectedValues);
       }
-    }).get();
+    });
-    console.log(role_ids)
+    return combinedValues;
-    return role_ids
   }
   async function send_server(data) {
     let token = getCookie("_xsrf")
@@ -929,7 +910,6 @@
 
 
       console.log(formDataJsonString);
-
       send_server(formDataJsonString);
     });
 
@@ -1061,19 +1041,6 @@
   $(".tree-reset").on("click", function () {
     location.href = "/server/step1";
   });
-  function dropDown(event) {
-    event.target.parentElement.children[1].classList.remove("d-none");
-    document.getElementById("overlay").classList.remove("d-none");
-  }
-
-  function hide(event) {
-    let items = document.getElementsByClassName('menu');
-    items.forEach(item => {
-      item.classList.add("d-none");
-    })
-
-    document.getElementById("overlay").classList.add("d-none");
-  }
 
   $(document).ready(function () {
     console.log('ready');
@@ -1254,4 +1221,6 @@
     serverTypeChange(selectObj);
   }
 </script>
+
+<script src="../../static/assets/js/shared/bootstrap-select-1.13.18.js"></script>
 {% end %}

app/translations/cs_CS.json

@@ -605,6 +605,8 @@
         "minMem": "Minimální paměť",
         "myNewServer": "Nový server",
         "newServer": "Vytvořit nový server",
+        "noRole": "Žádna role nebyla nalezena z tím to vstupem",
+        "noneRoles": "Žádne role vybrány",
         "quickSettings": "Rychlé nastavení",
         "quickSettingsDescription": "Nebojte se, můžete je změnit později.",
         "resetForm": "Obnovit nastavení formuláře",
@@ -716,4 +718,4 @@
         "webhook_body": "Webhook Body",
         "webhooks": "Webhooky"
     }
-}
+}

app/translations/de_DE.json

@@ -586,6 +586,8 @@
         "minMem": "Minimaler RAM",
         "myNewServer": "Mein neuer Server",
         "newServer": "Neuen Server erstellen",
+        "noRole": "Keine Rolle mit aktuellem Suchparameter gefunden",
+        "noneRoles": "Keine Rollen ausgewählt",
         "quickSettings": "Schnelleinstellungen",
         "quickSettingsDescription": "Keine Sorge, Änderungen können später immer noch vorgenommen werden.",
         "resetForm": "Konfiguration zurücksetzen",
@@ -697,4 +699,4 @@
         "webhook_body": "Webhook-Inhalt",
         "webhooks": "Webhooks"
     }
-}
+}

app/translations/en_EN.json

@@ -582,6 +582,8 @@
         "minMem": "Minimum Memory",
         "myNewServer": "My New Server",
         "newServer": "Create New Server",
+        "noRole": "No role found with current search parameter",
+        "noneRoles": "No Roles Selected",
         "quickSettings": "Quick Settings",
         "quickSettingsDescription": "Don't worry, you can change these later",
         "resetForm": "Reset Form",
@@ -693,4 +695,4 @@
         "webhook_body": "Webhook Body",
         "webhooks": "Webhooks"
     }
-}
+}

app/translations/es_ES.json

@@ -586,6 +586,8 @@
         "minMem": "Memoria mínima",
         "myNewServer": "Mi nuevo Servidor",
         "newServer": "Crear Servidor",
+        "noRole": "No se encontró ningún rol con el parámetro de búsqueda actual",
+        "noneRoles": "No hay roles seleccionados",
         "quickSettings": "Ajustes rápidos",
         "quickSettingsDescription": "No te preocupes, puedes cambiarlos más tarde.",
         "resetForm": "Limpiar formulario",
@@ -697,4 +699,4 @@
         "webhook_body": "Cuerpo del Webhook",
         "webhooks": "Webhooks"
     }
-}
+}

app/translations/fr_FR.json

@@ -558,7 +558,7 @@
         "importing": "Importation ...",
         "installing": "Installation ...",
         "restart": "Redémarrer",
-        "sendCommand": "Envoiyer commande",
+        "sendCommand": "Envoyer commande",
         "start": "Démarrer",
         "starting": "Démarrage retardé",
         "stop": "Arrêter",
@@ -586,8 +586,10 @@
         "minMem": "Mémoire Minimum",
         "myNewServer": "Mon Nouveau Serveur",
         "newServer": "Créer un Nouveau Serveur",
+        "noRole": "Aucun rôle trouvé avec les paramètres de recherche suivants",
+        "noneRoles": "Aucun Rôle Sélectionné ",
         "quickSettings": "Paramètres Rapides",
-        "quickSettingsDescription": "Pas d'Inquiétude, tu peux changer tout ça polus tard",
+        "quickSettingsDescription": "Pas d'Inquiétude, tu peux changer tout ça plus tard",
         "resetForm": "Réinitialiser Formulaire",
         "save": "Sauvegarder",
         "selectRole": "Sélectionnez le rôle(s)",
@@ -597,7 +599,7 @@
         "selectVersion": "Selectionner une Version",
         "selectZipDir": "Selectionner le dossier de l'archive depuis lequel extraire les fichiers",
         "serverJar": "Fichier Jar du Serveur",
-        "serverName": "Non du Serveur",
+        "serverName": "Nom du Serveur",
         "serverPath": "Chemin du Serveur",
         "serverPort": "Port du Serveur",
         "serverSelect": "Sélectionner un Serveur",
@@ -697,4 +699,4 @@
         "webhook_body": "Corps du Webhook",
         "webhooks": "Webhooks"
     }
-}
+}

app/translations/he_IL.json

@@ -586,6 +586,8 @@
         "minMem": "מינימום זיכרון",
         "myNewServer": "השרת החדש שלי",
         "newServer": "צור שרת חדש",
+        "noRole": "לא נמצא תפקיד עם פרמטר החיפוש הנוכחי",
+        "noneRoles": "לא נבחרו תפקידים",
         "quickSettings": "הגדרות מהירות",
         "quickSettingsDescription": "אל תדאג, אתה יכול לשנות את אלה מאוחר יותר",
         "resetForm": "אפס טופס",
@@ -669,6 +671,9 @@
         "userTheme": "ערכת נושא UI",
         "uses": "מספר השימושים המותרים (-1==ללא הגבלה)"
     },
+    "validators": {
+        "passLength": "סיסמא קצרה מדי. אורך מינימלי: 8"
+    },
     "webhooks": {
         "areYouSureDel": "האם אתה בטוח שברצונך למחוק את ה-Webhook הזה?",
         "areYouSureRun": "האם אתה בטוח שברצונך לבדוק את ה-Webhook הזה?",
@@ -694,4 +699,4 @@
         "webhook_body": "גוף ה-Webhook",
         "webhooks": "Webhooks"
     }
-}
+}

app/translations/it_IT.json

@@ -586,6 +586,8 @@
         "minMem": "Memoria minima",
         "myNewServer": "Il mio nuovo Server",
         "newServer": "Crea un Nuovo Server",
+        "noRole": "Nessun ruolo trovato con questo parametro di ricerca",
+        "noneRoles": "Nessun ruolo selezionato",
         "quickSettings": "Impostazioni Rapide",
         "quickSettingsDescription": "Non ti preoccupare, puoi cambiarle più tardi",
         "resetForm": "Reset Form",
@@ -697,4 +699,4 @@
         "webhook_body": "Corpo del Webhook",
         "webhooks": "Webhook"
     }
-}
+}

app/translations/lol_EN.json

@@ -586,6 +586,8 @@
         "minMem": "SMOL MEMZ LIMIT",
         "myNewServer": "MY NEW SOFT CHAIR",
         "newServer": "MAK A NU SERVR",
+        "noRole": "ME NO FINDY ANY ROLEZ WIF DIS SEARCHY",
+        "noneRoles": "NO ROLEZ PICKED",
         "quickSettings": "FAST SETTINGZ!",
         "quickSettingsDescription": "NO FEAR, IT NOT PERMZ",
         "resetForm": "REZET",
@@ -697,4 +699,4 @@
         "webhook_body": "WEBHOOK FISH",
         "webhooks": "WEBHOOKZ"
     }
-}
+}

app/translations/lv_LV.json

@@ -587,6 +587,8 @@
         "minMem": "Minimālā Atmiņa",
         "myNewServer": "Mans Jaunais Serveris",
         "newServer": "Izveidot Jaunu Serveri",
+        "noRole": "Nav lomas ar izvēlētiem meklēšanas parametriem",
+        "noneRoles": "Nav Izvēlētas Lomas",
         "quickSettings": "Ātrie Iestatījumi",
         "quickSettingsDescription": "Neuztraucies, tos var izmainīt vēlāk",
         "resetForm": "Notīrīt Formu",
@@ -698,4 +700,4 @@
         "webhook_body": "Webhook Saturs",
         "webhooks": "Webhooki"
     }
-}
+}

app/translations/nl_BE.json

@@ -586,6 +586,8 @@
         "minMem": "Minimaal geheugen",
         "myNewServer": "My New Server",
         "newServer": "Nieuwe server maken",
+        "noRole": "Geen rol gevonden met huidige zoekparameters",
+        "noneRoles": "Geen rollen geselecteerd",
         "quickSettings": "Snelle instellingen",
         "quickSettingsDescription": "Maak je geen zorgen, je kunt deze later wijzigen",
         "resetForm": "Formulier resetten",
@@ -697,4 +699,4 @@
         "webhook_body": "Webhook-body",
         "webhooks": "Webhooks"
     }
-}
+}

app/translations/pl_PL.json

@@ -585,6 +585,8 @@
         "minMem": "Min. RAMu",
         "myNewServer": "Mój nowy serwer",
         "newServer": "Stwórz nowy serwer",
+        "noRole": "Nie znaleziono roli z tym wyszukiwaniem",
+        "noneRoles": "Nie zaznaczono żadnej roli",
         "quickSettings": "Szybkie ustawienia",
         "quickSettingsDescription": "Nie martw się, możesz te ustawienia zmienić później",
         "resetForm": "Resetuj formę",
@@ -696,4 +698,4 @@
         "webhook_body": "Treść Webhooka",
         "webhooks": "Webhooki"
     }
-}
+}

app/translations/th_TH_incomplete.json

@@ -696,4 +696,4 @@
         "webhook_body": "ภายใน Webhook",
         "webhooks": "Webhooks"
     }
-}
+}

app/translations/tr_TR.json

@@ -585,6 +585,8 @@
         "minMem": "Minimum Bellek",
         "myNewServer": "Benim Yeni Sunucum",
         "newServer": "Yeni Sunucu Oluştur",
+        "noRole": "Şu arama parametresiyle herhangi bir rol bulunamadı:",
+        "noneRoles": "Rol Seçilmedi",
         "quickSettings": "Hızlı Ayarlar",
         "quickSettingsDescription": "Endişelenmeyin, bunları daha sonra değiştirebilirsiniz",
         "resetForm": "Formu Sıfırla",
@@ -696,4 +698,4 @@
         "webhook_body": "Webhook Gövdesi",
         "webhooks": "Webhooklar"
     }
-}
+}

app/translations/uk_UA.json

@@ -585,6 +585,8 @@
         "minMem": "Мінімум пам'яті",
         "myNewServer": "Мій новий сервер (краще називати латиницею)",
         "newServer": "Створити новий сервер",
+        "noRole": "Не найдено ролей, за даними параметрами",
+        "noneRoles": "Жодних ролей не вибрано",
         "quickSettings": "Швидкі налаштування",
         "quickSettingsDescription": "Не хвилюйтесь, ви можете це змінити це пізніше",
         "resetForm": "Скинути форму",
@@ -696,4 +698,4 @@
         "webhook_body": "Код Вебхука",
         "webhooks": "Вебхуки"
     }
-}
+}

app/translations/zh_CN.json

@@ -586,6 +586,8 @@
         "minMem": "最小内存",
         "myNewServer": "我的新服务器",
         "newServer": "创建新服务器",
+        "noRole": "未找到角色。当前搜索参数：",
+        "noneRoles": "未选择角色",
         "quickSettings": "快捷设置",
         "quickSettingsDescription": "别担心，你可以稍后再更改这些设置",
         "resetForm": "重置表单",
@@ -697,4 +699,4 @@
         "webhook_body": "Webhook 消息体（Body）",
         "webhooks": "Webhook"
     }
-}
+}