0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.0 за полунощ, 17 за 5 следобед). Имайте предвид, че този час е според часовата зона на сървъра и може да не съвпада с часовника на системата Ви.0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.0 pro půlnoc, 17 pro 5:00pm). Mějte na paměti, že tato hodina závisí na hodinách samotného serveru a nemusí tak souhlasit se systémovými hodinami. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.0 für Mitternacht, 17 für 5 Uhr Nachmittags). Beachten Sie, dass die Zeit auf der Serverzeit basiert und daher nicht umbedingt mit ihrer Systemzeit übereinstimmen muss.0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.0 pour minuit, 17 pour 5:00 pm). Gardez à l'esprit qu'il s'agit de l'heure du serveur, et peut ne pas correspondre à votre heure locale.0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.0 za ponoć, 17za 5 popodne).Imajte na umu da to vrijeme predstavlja vrijeme servera te ne mora predstavljati vrijeme na Vašem sistemu. Vrijeme servera je: 0 az éjfél, 17 a délután 5 óra). Tartsd észben, hogy ez az időpont a szerver idejét veszi figyelembe és előfordulhat, hogy nem egyezik meg a Te gépeden jelzett idővel. A becsült szerver idő jelenleg: 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.0per mezzanotte, 17per le 17: 00). Tieni presente che questa è l'ora secondo il server stesso, e potrebbe non combaciare esattamente al tuo orologio di sistema.0、午後5:00は17)これはサーバー自体に基づく時間であり、システムの時計と正確に一致しない場合があります。
次の日のダイジェストは",
"notifications.remove-images": "Remove images from email notifications",
+ "require-email-address": "Require new users to specify an email address",
+ "require-email-address-warning": "By default, users can opt-out of entering an email address. Enabling this option means they have to enter an email address in order to proceed with registration. It does not ensure user will enter a real email address, nor even an address they own.",
"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws."
}
\ No newline at end of file
diff --git a/public/language/ko/admin/settings/email.json b/public/language/ko/admin/settings/email.json
index 1b45f1e43b..94e89462f5 100644
--- a/public/language/ko/admin/settings/email.json
+++ b/public/language/ko/admin/settings/email.json
@@ -37,6 +37,8 @@
"subscriptions.hour": "포럼 메일 발송 시간",
"subscriptions.hour-help": "정기 포럼 메일을 보낼 시간을 입력해주세요. (예: 0은 자정, 17은 오후 5시 입니다. 이 시간은 서버 시간 기준이며, 사용자의 시스템 시간과 일치하지 않을 수 있습니다.
서버 시간은 입니다.
다음 정기 포럼 메일은 에 발송 예정입니다.",
"notifications.remove-images": "이메일 알림에서 이미지 제거",
+ "require-email-address": "Require new users to specify an email address",
+ "require-email-address-warning": "By default, users can opt-out of entering an email address. Enabling this option means they have to enter an email address in order to proceed with registration. It does not ensure user will enter a real email address, nor even an address they own.",
"include-unverified-emails": "전자 메일을 명시적으로 확인하지 않은 수신자에게 전자 메일 보내기",
"include-unverified-warning": "기본적으로 계정과 연결된 전자 메일이 있는 사용자는 이미 확인되었지만 그렇지 않은 경우가 있습니다(예: SSO 로그인, 약관으로부터 제외된 사용자 등). 사용자가 위험을 감수하고 이 설정을 사용하도록 설정합니다. – 확인되지 않은 주소로 이메일을 보내는 것은 지역별 스팸 방지법을 위반하는 것일 수 있습니다."
}
\ No newline at end of file
diff --git a/public/language/lt/admin/settings/email.json b/public/language/lt/admin/settings/email.json
index 9bdbde26a6..af4e100eb6 100644
--- a/public/language/lt/admin/settings/email.json
+++ b/public/language/lt/admin/settings/email.json
@@ -37,6 +37,8 @@
"subscriptions.hour": "Digest Hour",
"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
"notifications.remove-images": "Remove images from email notifications",
+ "require-email-address": "Require new users to specify an email address",
+ "require-email-address-warning": "By default, users can opt-out of entering an email address. Enabling this option means they have to enter an email address in order to proceed with registration. It does not ensure user will enter a real email address, nor even an address they own.",
"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws."
}
\ No newline at end of file
diff --git a/public/language/lv/admin/settings/email.json b/public/language/lv/admin/settings/email.json
index 0a17adb1dd..ccc035c86a 100644
--- a/public/language/lv/admin/settings/email.json
+++ b/public/language/lv/admin/settings/email.json
@@ -37,6 +37,8 @@
"subscriptions.hour": "Kopsavilkumu nosūtīšanas stunda",
"subscriptions.hour-help": "Ievadīt skaitli, kas norāda stundu, kurā nosūtītu e-pasta rakstu apkopojumu (piemēram, 0 nozīmē pusnakts, 17 nozīmē plkst.1700). Paturēt prātā, ka šī ir stunda servera laikā, un tā var neatbilst Tavam pulkstenim. Aptuvens servera laiks ir:
Nākamais ikdienas apkopojums tiks nosūtīts ",
"notifications.remove-images": "Remove images from email notifications",
+ "require-email-address": "Require new users to specify an email address",
+ "require-email-address-warning": "By default, users can opt-out of entering an email address. Enabling this option means they have to enter an email address in order to proceed with registration. It does not ensure user will enter a real email address, nor even an address they own.",
"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws."
}
\ No newline at end of file
diff --git a/public/language/ms/admin/settings/email.json b/public/language/ms/admin/settings/email.json
index 9bdbde26a6..af4e100eb6 100644
--- a/public/language/ms/admin/settings/email.json
+++ b/public/language/ms/admin/settings/email.json
@@ -37,6 +37,8 @@
"subscriptions.hour": "Digest Hour",
"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
"notifications.remove-images": "Remove images from email notifications",
+ "require-email-address": "Require new users to specify an email address",
+ "require-email-address-warning": "By default, users can opt-out of entering an email address. Enabling this option means they have to enter an email address in order to proceed with registration. It does not ensure user will enter a real email address, nor even an address they own.",
"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws."
}
\ No newline at end of file
diff --git a/public/language/nb/admin/settings/email.json b/public/language/nb/admin/settings/email.json
index 9bdbde26a6..af4e100eb6 100644
--- a/public/language/nb/admin/settings/email.json
+++ b/public/language/nb/admin/settings/email.json
@@ -37,6 +37,8 @@
"subscriptions.hour": "Digest Hour",
"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
"notifications.remove-images": "Remove images from email notifications",
+ "require-email-address": "Require new users to specify an email address",
+ "require-email-address-warning": "By default, users can opt-out of entering an email address. Enabling this option means they have to enter an email address in order to proceed with registration. It does not ensure user will enter a real email address, nor even an address they own.",
"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws."
}
\ No newline at end of file
diff --git a/public/language/nl/admin/settings/email.json b/public/language/nl/admin/settings/email.json
index d4cb9b7f6d..6a2023db5a 100644
--- a/public/language/nl/admin/settings/email.json
+++ b/public/language/nl/admin/settings/email.json
@@ -37,6 +37,8 @@
"subscriptions.hour": "Uur van Digest",
"subscriptions.hour-help": "Voer het nummer in dat het uur representeerd waarop scheduled email digests worden verstuurd (bv. 0 voor middernacht, 17 voor 17:00). Neem er s.v.p. notie van dat dit het uur is van de server self, dit hoeft niet exact overeen te komen met de klok van uw systeem.
De tijd op de server is bij benadering:
De volgende dagelijkse digest staat gepland om ",
"notifications.remove-images": "Remove images from email notifications",
+ "require-email-address": "Require new users to specify an email address",
+ "require-email-address-warning": "By default, users can opt-out of entering an email address. Enabling this option means they have to enter an email address in order to proceed with registration. It does not ensure user will enter a real email address, nor even an address they own.",
"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws."
}
\ No newline at end of file
diff --git a/public/language/pl/admin/settings/email.json b/public/language/pl/admin/settings/email.json
index f8ffa2b0cc..d21ded0e7c 100644
--- a/public/language/pl/admin/settings/email.json
+++ b/public/language/pl/admin/settings/email.json
@@ -37,6 +37,8 @@
"subscriptions.hour": "Godzina podsumowania",
"subscriptions.hour-help": "Wprowadź liczbę odpowiadającą godzinie, o której mają być wysyłane regularne e-maile z podsumowaniem (np. 0 dla północy lub 17 dla 17:00). Pamiętaj, że godzina jest godziną serwera i nie musi zgadzać się z czasem lokalnym administratora. Przybliżony czas serwera to:
Wysłanie kolejnego e-maila z podsumowaniem zaplanowano na ",
"notifications.remove-images": "Remove images from email notifications",
+ "require-email-address": "Require new users to specify an email address",
+ "require-email-address-warning": "By default, users can opt-out of entering an email address. Enabling this option means they have to enter an email address in order to proceed with registration. It does not ensure user will enter a real email address, nor even an address they own.",
"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws."
}
\ No newline at end of file
diff --git a/public/language/pt-BR/admin/settings/email.json b/public/language/pt-BR/admin/settings/email.json
index a00c34d939..f17e1af1b9 100644
--- a/public/language/pt-BR/admin/settings/email.json
+++ b/public/language/pt-BR/admin/settings/email.json
@@ -37,6 +37,8 @@
"subscriptions.hour": "Hora de Envio dos Resumos",
"subscriptions.hour-help": "Por favor, entre um número representando a hora para enviar os resumos agendados via e-mail (por exemplo: 0 para meia-noite, 17 para 5:00pm). Tenha em mente que esta é a hora de acordo com o servidor e pode não combinar exatamente com o relógio do seu sistema.
O horário aproximado do servidor é:
O próximo resumo diário está agendado para ser enviado ",
"notifications.remove-images": "Remover imagens de notificações por e-mail",
+ "require-email-address": "Require new users to specify an email address",
+ "require-email-address-warning": "By default, users can opt-out of entering an email address. Enabling this option means they have to enter an email address in order to proceed with registration. It does not ensure user will enter a real email address, nor even an address they own.",
"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws."
}
\ No newline at end of file
diff --git a/public/language/pt-PT/admin/settings/email.json b/public/language/pt-PT/admin/settings/email.json
index 2172f608f7..8ec1b5c482 100644
--- a/public/language/pt-PT/admin/settings/email.json
+++ b/public/language/pt-PT/admin/settings/email.json
@@ -37,6 +37,8 @@
"subscriptions.hour": "Hora do Resumo",
"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
"notifications.remove-images": "Remove images from email notifications",
+ "require-email-address": "Require new users to specify an email address",
+ "require-email-address-warning": "By default, users can opt-out of entering an email address. Enabling this option means they have to enter an email address in order to proceed with registration. It does not ensure user will enter a real email address, nor even an address they own.",
"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws."
}
\ No newline at end of file
diff --git a/public/language/ro/admin/settings/email.json b/public/language/ro/admin/settings/email.json
index 9bdbde26a6..af4e100eb6 100644
--- a/public/language/ro/admin/settings/email.json
+++ b/public/language/ro/admin/settings/email.json
@@ -37,6 +37,8 @@
"subscriptions.hour": "Digest Hour",
"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
"notifications.remove-images": "Remove images from email notifications",
+ "require-email-address": "Require new users to specify an email address",
+ "require-email-address-warning": "By default, users can opt-out of entering an email address. Enabling this option means they have to enter an email address in order to proceed with registration. It does not ensure user will enter a real email address, nor even an address they own.",
"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws."
}
\ No newline at end of file
diff --git a/public/language/ru/admin/settings/email.json b/public/language/ru/admin/settings/email.json
index e9c4b56c62..c7ba003930 100644
--- a/public/language/ru/admin/settings/email.json
+++ b/public/language/ru/admin/settings/email.json
@@ -37,6 +37,8 @@
"subscriptions.hour": "Час отправки",
"subscriptions.hour-help": "Введите число, соответствующее номеру часа (например, 0 для полуночи, 17 для 17:00). Имейте в виду, что время определяется по часовому поясу сервера.
Текущее время сервера:
Следующая рассылка запланирована на ",
"notifications.remove-images": "Удалить изображения из уведомлений по электронной почте",
+ "require-email-address": "Require new users to specify an email address",
+ "require-email-address-warning": "By default, users can opt-out of entering an email address. Enabling this option means they have to enter an email address in order to proceed with registration. It does not ensure user will enter a real email address, nor even an address they own.",
"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws."
}
\ No newline at end of file
diff --git a/public/language/rw/admin/settings/email.json b/public/language/rw/admin/settings/email.json
index 9bdbde26a6..af4e100eb6 100644
--- a/public/language/rw/admin/settings/email.json
+++ b/public/language/rw/admin/settings/email.json
@@ -37,6 +37,8 @@
"subscriptions.hour": "Digest Hour",
"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
"notifications.remove-images": "Remove images from email notifications",
+ "require-email-address": "Require new users to specify an email address",
+ "require-email-address-warning": "By default, users can opt-out of entering an email address. Enabling this option means they have to enter an email address in order to proceed with registration. It does not ensure user will enter a real email address, nor even an address they own.",
"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws."
}
\ No newline at end of file
diff --git a/public/language/sc/admin/settings/email.json b/public/language/sc/admin/settings/email.json
index 9bdbde26a6..af4e100eb6 100644
--- a/public/language/sc/admin/settings/email.json
+++ b/public/language/sc/admin/settings/email.json
@@ -37,6 +37,8 @@
"subscriptions.hour": "Digest Hour",
"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
"notifications.remove-images": "Remove images from email notifications",
+ "require-email-address": "Require new users to specify an email address",
+ "require-email-address-warning": "By default, users can opt-out of entering an email address. Enabling this option means they have to enter an email address in order to proceed with registration. It does not ensure user will enter a real email address, nor even an address they own.",
"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws."
}
\ No newline at end of file
diff --git a/public/language/sk/admin/settings/email.json b/public/language/sk/admin/settings/email.json
index 1ecd846835..e05f5ca09a 100644
--- a/public/language/sk/admin/settings/email.json
+++ b/public/language/sk/admin/settings/email.json
@@ -37,6 +37,8 @@
"subscriptions.hour": "Digest Hour",
"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
"notifications.remove-images": "Remove images from email notifications",
+ "require-email-address": "Require new users to specify an email address",
+ "require-email-address-warning": "By default, users can opt-out of entering an email address. Enabling this option means they have to enter an email address in order to proceed with registration. It does not ensure user will enter a real email address, nor even an address they own.",
"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws."
}
\ No newline at end of file
diff --git a/public/language/sl/admin/admin.json b/public/language/sl/admin/admin.json
index 3afbbf5ab7..c7ac493d94 100644
--- a/public/language/sl/admin/admin.json
+++ b/public/language/sl/admin/admin.json
@@ -1,7 +1,7 @@
{
- "alert.confirm-rebuild-and-restart": "Ste prepričani, da želite znova zagnati NodeBB?",
+ "alert.confirm-rebuild-and-restart": "Ste prepričani, da želite obnoviti in ponovno zagnati NodeBB?",
"alert.confirm-restart": "Ste prepričani, da želite znova zagnati NodeBB?",
- "acp-title": "NodeBB administracijska nadzorna plošča",
- "settings-header-contents": "Contents"
+ "acp-title": "%1 | NodeBB skrbniška nadzorna plošča",
+ "settings-header-contents": "Vsebine"
}
\ No newline at end of file
diff --git a/public/language/sl/admin/advanced/cache.json b/public/language/sl/admin/advanced/cache.json
index 2fd7984883..a6c69b5944 100644
--- a/public/language/sl/admin/advanced/cache.json
+++ b/public/language/sl/admin/advanced/cache.json
@@ -1,6 +1,6 @@
{
- "post-cache": "Post Cache",
- "percent-full": "%1% Full",
- "post-cache-size": "Post Cache Size",
- "items-in-cache": "Items in Cache"
+ "post-cache": "Predpomnilnik objav",
+ "percent-full": "%1%Zasedeno",
+ "post-cache-size": "Velikost predpomnilnika objav",
+ "items-in-cache": "Elementi v predpomnilniku"
}
\ No newline at end of file
diff --git a/public/language/sl/admin/advanced/database.json b/public/language/sl/admin/advanced/database.json
index 9167b381ed..a116b29172 100644
--- a/public/language/sl/admin/advanced/database.json
+++ b/public/language/sl/admin/advanced/database.json
@@ -2,51 +2,51 @@
"x-b": "%1 b",
"x-mb": "%1 mb",
"x-gb": "%1 gb",
- "uptime-seconds": "Uptime in Seconds",
- "uptime-days": "Uptime in Days",
+ "uptime-seconds": "Čas delovanja v sekundah",
+ "uptime-days": "Čas delovanja v dneh",
"mongo": "Mongo",
- "mongo.version": "MongoDB Version",
- "mongo.storage-engine": "Storage Engine",
- "mongo.collections": "Collections",
- "mongo.objects": "Objects",
- "mongo.avg-object-size": "Avg. Object Size",
- "mongo.data-size": "Data Size",
- "mongo.storage-size": "Storage Size",
- "mongo.index-size": "Index Size",
- "mongo.file-size": "File Size",
- "mongo.resident-memory": "Resident Memory",
- "mongo.virtual-memory": "Virtual Memory",
+ "mongo.version": "MongoDB verzija",
+ "mongo.storage-engine": "Pogon za shranjevanje",
+ "mongo.collections": "Zbirke",
+ "mongo.objects": "Predmeti",
+ "mongo.avg-object-size": "Povpr. velikost predmeta",
+ "mongo.data-size": "Velikost podatkov",
+ "mongo.storage-size": "Velikost shrambe",
+ "mongo.index-size": "Velikost indeksa",
+ "mongo.file-size": "Velikost datoteke",
+ "mongo.resident-memory": "Stalni spomin",
+ "mongo.virtual-memory": "Navidezni spomin",
"mongo.mapped-memory": "Mapped Memory",
"mongo.bytes-in": "Bytes In",
"mongo.bytes-out": "Bytes Out",
- "mongo.num-requests": "Number of Requests",
+ "mongo.num-requests": "Število zahtev",
"mongo.raw-info": "MongoDB Raw Info",
- "mongo.unauthorized": "NodeBB was unable to query the MongoDB database for relevant statistics. Please ensure that the user in use by NodeBB contains the "clusterMonitor" role for the "admin" database.",
+ "mongo.unauthorized": "NodeBB ni mogel poizvedovati po zbirki podatkov MongoDB o ustreznih statističnih podatkih. Prepričajte se, da uporabnik, ki ga uporablja NodeBB, ima vlogo "nadzornika gruče" za "administriranje" zbirke podatkov.",
"redis": "Redis",
- "redis.version": "Redis Version",
- "redis.keys": "Keys",
- "redis.expires": "Expires",
- "redis.avg-ttl": "Average TTL",
- "redis.connected-clients": "Connected Clients",
+ "redis.version": "Redis verzija",
+ "redis.keys": "Ključi",
+ "redis.expires": "Poteče",
+ "redis.avg-ttl": "Povprečni TTL",
+ "redis.connected-clients": "Povezane stranke",
"redis.connected-slaves": "Connected Slaves",
- "redis.blocked-clients": "Blocked Clients",
- "redis.used-memory": "Used Memory",
- "redis.memory-frag-ratio": "Memory Fragmentation Ratio",
- "redis.total-connections-recieved": "Total Connections Received",
- "redis.total-commands-processed": "Total Commands Processed",
- "redis.iops": "Instantaneous Ops. Per Second",
- "redis.iinput": "Instantaneous Input Per Second",
- "redis.ioutput": "Instantaneous Output Per Second",
- "redis.total-input": "Total Input",
- "redis.total-output": "Total Ouput",
+ "redis.blocked-clients": "Blokirane stranke",
+ "redis.used-memory": "Uporabljen pomnilnik",
+ "redis.memory-frag-ratio": "Razmerje razdrobljenosti pomnilnika",
+ "redis.total-connections-recieved": "Prejete povezave skupaj",
+ "redis.total-commands-processed": "Obdelani ukazi skupaj",
+ "redis.iops": "Takojšnje operacije na sekundo",
+ "redis.iinput": "Takojšnji vnos na sekundo",
+ "redis.ioutput": "Takojšnji izhod na sekundo",
+ "redis.total-input": "Vnos skupaj",
+ "redis.total-output": "Izhod skupaj",
"redis.keyspace-hits": "Keyspace Hits",
"redis.keyspace-misses": "Keyspace Misses",
"redis.raw-info": "Redis Raw Info",
"postgres": "Postgres",
- "postgres.version": "PostgreSQL Version",
+ "postgres.version": "PostgreSQL verzija",
"postgres.raw-info": "Postgres Raw Info"
}
diff --git a/public/language/sl/admin/advanced/errors.json b/public/language/sl/admin/advanced/errors.json
index 546f0f1508..2cbbbce7ce 100644
--- a/public/language/sl/admin/advanced/errors.json
+++ b/public/language/sl/admin/advanced/errors.json
@@ -1,14 +1,14 @@
{
"figure-x": "Figure %1",
- "error-events-per-day": "%1 events per day",
- "error.404": "404 Not Found",
- "error.503": "503 Service Unavailable",
- "manage-error-log": "Manage Error Log",
- "export-error-log": "Export Error Log (CSV)",
- "clear-error-log": "Clear Error Log",
- "route": "Route",
- "count": "Count",
- "no-routes-not-found": "Hooray! No 404 errors!",
- "clear404-confirm": "Are you sure you wish to clear the 404 error logs?",
- "clear404-success": "\"404 Not Found\" errors cleared"
+ "error-events-per-day": "%1 dogodkov na dan",
+ "error.404": "4040 ni najdeno",
+ "error.503": "503 storitev ni na voljo",
+ "manage-error-log": "Upravljaj dnevnik napak",
+ "export-error-log": "Izvozi dnevnik napak (CSV)",
+ "clear-error-log": "Počisti dnevnik napak",
+ "route": "Pot",
+ "count": "Število",
+ "no-routes-not-found": "Hura! Ni napak 404! ",
+ "clear404-confirm": "Ste prepričani, da želite izbrisati dnevnik napak 404?",
+ "clear404-success": "Napake \"404 ni najdeno\" so počiščene"
}
\ No newline at end of file
diff --git a/public/language/sl/admin/advanced/events.json b/public/language/sl/admin/advanced/events.json
index 56d9457971..2d24611e2b 100644
--- a/public/language/sl/admin/advanced/events.json
+++ b/public/language/sl/admin/advanced/events.json
@@ -1,12 +1,12 @@
{
- "events": "Events",
- "no-events": "There are no events",
- "control-panel": "Events Control Panel",
- "delete-events": "Delete Events",
- "filters": "Filters",
- "filters-apply": "Apply Filters",
- "filter-type": "Event Type",
- "filter-start": "Start Date",
- "filter-end": "End Date",
- "filter-perPage": "Per Page"
+ "events": "Dogodki",
+ "no-events": "Ni dogodkov",
+ "control-panel": "Nadzorna plošča za dogodke",
+ "delete-events": "Izbriši dogodke",
+ "filters": "Filtri",
+ "filters-apply": "Uveljavi filtre",
+ "filter-type": "Tip dogodka",
+ "filter-start": "Začetni datum",
+ "filter-end": "Končni datum",
+ "filter-perPage": "Na stran"
}
\ No newline at end of file
diff --git a/public/language/sl/admin/advanced/logs.json b/public/language/sl/admin/advanced/logs.json
index b9de400e1c..14e4592111 100644
--- a/public/language/sl/admin/advanced/logs.json
+++ b/public/language/sl/admin/advanced/logs.json
@@ -1,7 +1,7 @@
{
- "logs": "Logs",
- "control-panel": "Logs Control Panel",
- "reload": "Reload Logs",
- "clear": "Clear Logs",
- "clear-success": "Logs Cleared!"
+ "logs": "Dnevniki",
+ "control-panel": "Nadzorna plošča dnevnikov",
+ "reload": "Ponovno naloži dnevnike",
+ "clear": "Počisti dnevnike",
+ "clear-success": "Dnevniki so počiščeni!"
}
\ No newline at end of file
diff --git a/public/language/sl/admin/appearance/customise.json b/public/language/sl/admin/appearance/customise.json
index 97abb5ede5..cea68f5b8a 100644
--- a/public/language/sl/admin/appearance/customise.json
+++ b/public/language/sl/admin/appearance/customise.json
@@ -1,16 +1,16 @@
{
- "custom-css": "Custom CSS/LESS",
+ "custom-css": "CSS/LESS po meri",
"custom-css.description": "Enter your own CSS/LESS declarations here, which will be applied after all other styles.",
- "custom-css.enable": "Enable Custom CSS/LESS",
+ "custom-css.enable": "Omogoči CSS/LESS po meri",
- "custom-js": "Custom Javascript",
- "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.",
- "custom-js.enable": "Enable Custom Javascript",
+ "custom-js": "Javascript po meri",
+ "custom-js.description": "Tukaj vnesite svoj javascript. Izveden bo, ko se stran popolnoma naloži.",
+ "custom-js.enable": "Omogoči Javascript po meri",
- "custom-header": "Custom Header",
- "custom-header.description": "Enter custom HTML here (ex. Meta Tags, etc.), which will be appended to the <head> section of your forum's markup. Script tags are allowed, but are discouraged, as the Custom Javascript tab is available.",
- "custom-header.enable": "Enable Custom Header",
+ "custom-header": "Glava po meri",
+ "custom-header.description": "Tukaj vnesite HTML po meri (npr. meta oznake itd.), ki bo dodan v & lt; head & gt; razdelek oznak vašega foruma. Oznake skript so dovoljene, vendar niso priporočljive, saj je na voljo zavihek Javascript po meri.",
+ "custom-header.enable": "Omogoči glavo po meri",
"custom-css.livereload": "Enable Live Reload",
- "custom-css.livereload.description": "Enable this to force all sessions on every device under your account to refresh whenever you click save"
+ "custom-css.livereload.description": "Omogočite to, da se vse seje na vsaki napravi v vašem računu osvežijo, ko kliknete shrani"
}
\ No newline at end of file
diff --git a/public/language/sl/admin/appearance/skins.json b/public/language/sl/admin/appearance/skins.json
index 4db6fbdd8a..2d29a09f0d 100644
--- a/public/language/sl/admin/appearance/skins.json
+++ b/public/language/sl/admin/appearance/skins.json
@@ -1,9 +1,9 @@
{
- "loading": "Loading Skins...",
- "homepage": "Homepage",
- "select-skin": "Select Skin",
- "current-skin": "Current Skin",
- "skin-updated": "Skin Updated",
- "applied-success": "%1 skin was succesfully applied",
- "revert-success": "Skin reverted to base colours"
+ "loading": "Nalagam preobleke...",
+ "homepage": "Domača stran",
+ "select-skin": "Izberi preobleko",
+ "current-skin": "Trenutna preobleka",
+ "skin-updated": "Preobleka je posodobljena",
+ "applied-success": "%1 preobleke je bilo uspešno uveljavljene",
+ "revert-success": "Preobleka je povrnjena v osnovne barve"
}
\ No newline at end of file
diff --git a/public/language/sl/admin/appearance/themes.json b/public/language/sl/admin/appearance/themes.json
index 597830f379..3942ae0820 100644
--- a/public/language/sl/admin/appearance/themes.json
+++ b/public/language/sl/admin/appearance/themes.json
@@ -1,11 +1,11 @@
{
- "checking-for-installed": "Checking for installed themes...",
- "homepage": "Homepage",
- "select-theme": "Select Theme",
- "current-theme": "Current Theme",
- "no-themes": "No installed themes found",
- "revert-confirm": "Are you sure you wish to restore the default NodeBB theme?",
- "theme-changed": "Theme Changed",
- "revert-success": "You have successfully reverted your NodeBB back to it's default theme.",
- "restart-to-activate": "Please rebuild and restart your NodeBB to fully activate this theme."
+ "checking-for-installed": "Iščem nameščene teme...",
+ "homepage": "Domača stran",
+ "select-theme": "Izberi temo",
+ "current-theme": "Trenutna tema",
+ "no-themes": "Ni najdenih nameščenih tem",
+ "revert-confirm": "Ste prepričani, da želite obnoviti privzeto NodeBB temo?",
+ "theme-changed": "Tema je spremenjena",
+ "revert-success": "Uspešno ste povrnili vaš NodeBB nazaj na privzeto temo.",
+ "restart-to-activate": "Za popolno aktivacijo te teme obnovite in ponovno zaženete vaš NodeB."
}
\ No newline at end of file
diff --git a/public/language/sl/admin/dashboard.json b/public/language/sl/admin/dashboard.json
index 0de31d4917..c334df9b0f 100644
--- a/public/language/sl/admin/dashboard.json
+++ b/public/language/sl/admin/dashboard.json
@@ -1,88 +1,88 @@
{
- "forum-traffic": "Forum Traffic",
- "page-views": "Page Views",
- "unique-visitors": "Unique Visitors",
- "logins": "Logins",
- "new-users": "New Users",
- "posts": "Posts",
- "topics": "Topics",
- "page-views-seven": "Last 7 Days",
- "page-views-thirty": "Last 30 Days",
- "page-views-last-day": "Last 24 hours",
- "page-views-custom": "Custom Date Range",
- "page-views-custom-start": "Range Start",
- "page-views-custom-end": "Range End",
- "page-views-custom-help": "Enter a date range of page views you would like to view. If no date picker is available, the accepted format is YYYY-MM-DD",
- "page-views-custom-error": "Please enter a valid date range in the format YYYY-MM-DD",
+ "forum-traffic": "Promet na forumu",
+ "page-views": "Ogledi strani",
+ "unique-visitors": "Edinstveni obiskovalci",
+ "logins": "Prijave",
+ "new-users": "Novi uporabniki",
+ "posts": "Objave",
+ "topics": "Teme",
+ "page-views-seven": "Zadnjih 7 dni",
+ "page-views-thirty": "Zadnjih 30 dni",
+ "page-views-last-day": "Zadnjih 24 ur",
+ "page-views-custom": "Časovno obdobje po meri",
+ "page-views-custom-start": "Začetek obdobja",
+ "page-views-custom-end": "Konec obdobja",
+ "page-views-custom-help": "Vnesite časovno obdobje ogledov strani, ki bi si jih radi ogledali. Če izbirnik datumov ni na voljo, je sprejeta oblika LLLL-MM-DD",
+ "page-views-custom-error": "Vnesite veljavno časovno obdobje v obliki LLLL-MM-DD",
- "stats.yesterday": "Yesterday",
- "stats.today": "Today",
- "stats.last-week": "Last Week",
- "stats.this-week": "This Week",
- "stats.last-month": "Last Month",
- "stats.this-month": "This Month",
- "stats.all": "All Time",
+ "stats.yesterday": "Včeraj",
+ "stats.today": "Danes",
+ "stats.last-week": "Prejšnji teden",
+ "stats.this-week": "Ta teden",
+ "stats.last-month": "Zadnji mesec",
+ "stats.this-month": "Ta mesec",
+ "stats.all": "Celotni čas",
- "updates": "Updates",
- "running-version": "You are running NodeBB v%1.",
- "keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
- "up-to-date": "You are up-to-date
",
- "upgrade-available": "A new version (v%1) has been released. Consider upgrading your NodeBB.
",
- "prerelease-upgrade-available": "This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider upgrading your NodeBB.
",
- "prerelease-warning": "This is a pre-release version of NodeBB. Unintended bugs may occur.
",
- "fallback-emailer-not-found": "Fallback emailer not found!",
- "running-in-development": "Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.",
- "latest-lookup-failed": "Failed to look up latest available version of NodeBB
",
+ "updates": "Posodobitve",
+ "running-version": " Teče NodeBB v%1.",
+ "keep-updated": "Vedno se prepričajte, da je vaš NodeBB posodobljen za najnovejše varnostne popravke in popravke napak.",
+ "up-to-date": "Ste na tekočem
",
+ "upgrade-available": "Izdana je bila nova različica (v%1). Premislite o posodobitvi vašega NodeBB.
",
+ "prerelease-upgrade-available": "To je zastarela predizdajna različica NodeBB. Izšla je nova različica (v%1). Premislite o posodobitvi vašega NodeBB.
",
+ "prerelease-warning": "To je predizdajna različica NodeBB. Pojavijo se lahko nenameravane napake. ",
+ "fallback-emailer-not-found": "Povratnega e-poštnega sporočila ni mogoče najti!",
+ "running-in-development": "Forum teče v razvojnem načinu. Forum je lahko odprt za potencialne ranljivosti; obrnite se na skrbnika sistema.",
+ "latest-lookup-failed": "Najnovejše razpoložljive različice NodeBB ni bilo mogoče najti
",
- "notices": "Notices",
- "restart-not-required": "Restart not required",
- "restart-required": "Restart required",
- "search-plugin-installed": "Search Plugin installed",
- "search-plugin-not-installed": "Search Plugin not installed",
- "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality",
+ "notices": "Opombe",
+ "restart-not-required": "Ponovni zagon ni potreben",
+ "restart-required": "Potreben je ponovni zagon",
+ "search-plugin-installed": "Iskalni vtičnik je nameščen",
+ "search-plugin-not-installed": "Iskalni vtičnik ni nameščen",
+ "search-plugin-tooltip": "Za aktiviranje iskalne funkcije namestite iskalni vtičnik s strani vtičnika",
- "control-panel": "System Control",
- "rebuild-and-restart": "Rebuild & Restart",
- "restart": "Restart",
- "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.",
- "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.",
- "maintenance-mode": "Maintenance Mode",
- "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB",
- "realtime-chart-updates": "Realtime Chart Updates",
+ "control-panel": "Nadzor sistema",
+ "rebuild-and-restart": "Obnovi & ponovno zaženi",
+ "restart": "Ponovno zaženi",
+ "restart-warning": "Obnova ali ponovni zagon vašega NodeBB za nekaj sekund prekine vse obstoječe povezave.",
+ "restart-disabled": "Obnova in ponovni zagon vašega NodeBB sta onemogočena, saj se zdi, da ga ne izvajate prek ustreznega prikritega procesa.",
+ "maintenance-mode": "Način vzdrževanja",
+ "maintenance-mode-title": "Za nastavitev načina vzdrževanja za NodeBB kliknite tukaj",
+ "realtime-chart-updates": "Posodobitev grafikona v realnem času",
- "active-users": "Active Users",
- "active-users.users": "Users",
- "active-users.guests": "Guests",
- "active-users.total": "Total",
- "active-users.connections": "Connections",
+ "active-users": "Aktivni uporabniki",
+ "active-users.users": "Uporabniki",
+ "active-users.guests": "Gostje",
+ "active-users.total": "Skupaj",
+ "active-users.connections": "Povezave",
- "anonymous-registered-users": "Anonymous vs Registered Users",
- "anonymous": "Anonymous",
- "registered": "Registered",
+ "anonymous-registered-users": "Anonimni : Registrirani uporabniki",
+ "anonymous": "Anonimni",
+ "registered": "Registrirani",
- "user-presence": "User Presence",
+ "user-presence": "Prisotnost uporabnikov",
"on-categories": "On categories list",
"reading-posts": "Reading posts",
"browsing-topics": "Browsing topics",
- "recent": "Recent",
- "unread": "Unread",
+ "recent": "Nedavno",
+ "unread": "Neprebrano",
"high-presence-topics": "High Presence Topics",
- "graphs.page-views": "Page Views",
+ "graphs.page-views": "Ogledov strani",
"graphs.page-views-registered": "Page Views Registered",
"graphs.page-views-guest": "Page Views Guest",
"graphs.page-views-bot": "Page Views Bot",
- "graphs.unique-visitors": "Unique Visitors",
- "graphs.registered-users": "Registered Users",
- "graphs.anonymous-users": "Anonymous Users",
- "last-restarted-by": "Last restarted by",
- "no-users-browsing": "No users browsing",
+ "graphs.unique-visitors": "Edinstveni obiskovalci",
+ "graphs.registered-users": "Registrirani uporabniki",
+ "graphs.anonymous-users": "Anonimni uporabniki",
+ "last-restarted-by": "Nazadnje ponovno zagnal(a)",
+ "no-users-browsing": "Ne brska noben uporabnik",
- "back-to-dashboard": "Back to Dashboard",
- "details.no-users": "No users have joined within the selected timeframe",
- "details.no-topics": "No topics have been posted within the selected timeframe",
- "details.no-logins": "No logins have been recorded within the selected timeframe",
- "details.logins-static": "NodeBB only saves session data for %1 days, and so this table below will only show the most recently active sessions",
- "details.logins-login-time": "Login Time"
+ "back-to-dashboard": "Nazaj na nadzorno ploščo",
+ "details.no-users": "V izbranem časovnem okviru se ni pridružil noben uporabnik",
+ "details.no-topics": "V izbranem časovnem okviru ni bila objavljena nobena tema",
+ "details.no-logins": "V izbranem časovnem okviru ni bila zabeležena nobena prijava",
+ "details.logins-static": "NodeBB shranjuje samo podatke o sejah za %1 dni, zato bo ta spodnja tabela prikazala samo zadnje aktivne seje",
+ "details.logins-login-time": "Čas prijave"
}
diff --git a/public/language/sl/admin/development/info.json b/public/language/sl/admin/development/info.json
index 1003af1a5f..10d4238806 100644
--- a/public/language/sl/admin/development/info.json
+++ b/public/language/sl/admin/development/info.json
@@ -1,21 +1,21 @@
{
"you-are-on": "You are on %1:%2",
"ip": "IP %1",
- "nodes-responded": "%1 nodes responded within %2ms!",
- "host": "host",
+ "nodes-responded": "%1 vozlišč se je odzvalo v %2ms!",
+ "host": "gostitelj",
"primary": "primary / run jobs",
"pid": "pid",
"nodejs": "nodejs",
- "online": "online",
+ "online": "na spletu",
"git": "git",
- "memory": "memory",
- "load": "system load",
- "cpu-usage": "cpu usage",
- "uptime": "uptime",
+ "memory": "spomin",
+ "load": "obremenitev sistema",
+ "cpu-usage": "uporaba procesorja",
+ "uptime": "čas delovanja",
- "registered": "Registered",
- "sockets": "Sockets",
- "guests": "Guests",
+ "registered": "Registrirani",
+ "sockets": "Vtičnice",
+ "guests": "Gostje",
"info": "Info"
}
\ No newline at end of file
diff --git a/public/language/sl/admin/extend/plugins.json b/public/language/sl/admin/extend/plugins.json
index f7e60c4360..a6e276dff7 100644
--- a/public/language/sl/admin/extend/plugins.json
+++ b/public/language/sl/admin/extend/plugins.json
@@ -1,15 +1,15 @@
{
"trending": "Trending",
- "installed": "Installed",
- "active": "Active",
- "inactive": "Inactive",
- "out-of-date": "Out of Date",
- "none-found": "No plugins found.",
- "none-active": "No Active Plugins",
- "find-plugins": "Find Plugins",
+ "installed": "Nameščeno",
+ "active": "Aktivno",
+ "inactive": "Neaktivno",
+ "out-of-date": "zastarelo",
+ "none-found": "Vtičnikov ni bilo mogoče najti.",
+ "none-active": "Ni aktivnih vtičnikov.",
+ "find-plugins": "Najdi vtičnike",
- "plugin-search": "Plugin Search",
- "plugin-search-placeholder": "Search for plugin...",
+ "plugin-search": "Iskanje vtičnikov",
+ "plugin-search-placeholder": "Iskanje vtičnika...",
"submit-anonymous-usage": "Submit anonymous plugin usage data.",
"reorder-plugins": "Re-order Plugins",
"order-active": "Order Active Plugins",
@@ -19,31 +19,31 @@
"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
"order.explanation": "Plugins load in the order specified here, from top to bottom",
- "plugin-item.themes": "Themes",
- "plugin-item.deactivate": "Deactivate",
- "plugin-item.activate": "Activate",
- "plugin-item.install": "Install",
- "plugin-item.uninstall": "Uninstall",
- "plugin-item.settings": "Settings",
- "plugin-item.installed": "Installed",
- "plugin-item.latest": "Latest",
- "plugin-item.upgrade": "Upgrade",
- "plugin-item.more-info": "For more information:",
- "plugin-item.unknown": "Unknown",
+ "plugin-item.themes": "Teme",
+ "plugin-item.deactivate": "Deaktiviraj",
+ "plugin-item.activate": "Aktiviraj",
+ "plugin-item.install": "Namesti",
+ "plugin-item.uninstall": "Odstrani",
+ "plugin-item.settings": "Nastavitve",
+ "plugin-item.installed": "Nameščeno",
+ "plugin-item.latest": "Najnovejše",
+ "plugin-item.upgrade": "Posodobi",
+ "plugin-item.more-info": "Za več informacij:",
+ "plugin-item.unknown": "Neznano",
"plugin-item.unknown-explanation": "The state of this plugin could not be determined, possibly due to a misconfiguration error.",
- "plugin-item.compatible": "This plugin works on NodeBB %1",
+ "plugin-item.compatible": "Ta vtičnik deluje na NodeBB %1",
"plugin-item.not-compatible": "This plugin has no compatibility data, make sure it works before installing on your production environment.",
- "alert.enabled": "Plugin Enabled",
- "alert.disabled": "Plugin Disabled",
- "alert.upgraded": "Plugin Upgraded",
- "alert.installed": "Plugin Installed",
- "alert.uninstalled": "Plugin Uninstalled",
- "alert.activate-success": "Please rebuild and restart your NodeBB to fully activate this plugin",
- "alert.deactivate-success": "Plugin successfully deactivated",
- "alert.upgrade-success": "Please rebuild and restart your NodeBB to fully upgrade this plugin.",
- "alert.install-success": "Plugin successfully installed, please activate the plugin.",
- "alert.uninstall-success": "The plugin has been successfully deactivated and uninstalled.",
+ "alert.enabled": "Vtičnik omogočen",
+ "alert.disabled": "Vtičnik onemogočen",
+ "alert.upgraded": "Vtičnik posodobljen",
+ "alert.installed": "Vtičnik nameščen",
+ "alert.uninstalled": "Vtičnik odstranjen",
+ "alert.activate-success": "Za popolno aktivacijo tega vtičnika obnovite in ponovno zaženete vaš NodeB.",
+ "alert.deactivate-success": "Vtičnik je bil uspešno deaktiviran",
+ "alert.upgrade-success": "Za popolno nadgradnjo tega vtičnika obnovite in ponovno zaženete vaš NodeB.",
+ "alert.install-success": "Vtičnik je uspešno nameščen, aktivirajte ga.",
+ "alert.uninstall-success": "Vtičnik je bil uspešno deaktiviran in odstranjen.",
"alert.suggest-error": "NodeBB could not reach the package manager, proceed with installation of latest version?
Server returned (%1): %2",
"alert.package-manager-unreachable": "NodeBB could not reach the package manager, an upgrade is not suggested at this time.
",
"alert.incompatible": "Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.
",
@@ -53,5 +53,5 @@
"license.title": "Plugin License Information",
"license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.",
- "license.cta": "Do you wish to continue with activating this plugin?"
+ "license.cta": "Ali želite nadaljevati z aktiviranjem tega vtičnika?"
}
diff --git a/public/language/sl/admin/extend/rewards.json b/public/language/sl/admin/extend/rewards.json
index df89d441a7..ab9b5bc650 100644
--- a/public/language/sl/admin/extend/rewards.json
+++ b/public/language/sl/admin/extend/rewards.json
@@ -1,15 +1,15 @@
{
- "rewards": "Rewards",
+ "rewards": "Nagrade",
"condition-if-users": "If User's",
"condition-is": "Is:",
"condition-then": "Then:",
- "max-claims": "Amount of times reward is claimable",
+ "max-claims": "Kolikokrat je mogoče zahtevati nagrado",
"zero-infinite": "Enter 0 for infinite",
- "delete": "Delete",
- "enable": "Enable",
- "disable": "Disable",
+ "delete": "Izbriši",
+ "enable": "Omogoči",
+ "disable": "Onemogoči",
- "alert.delete-success": "Successfully deleted reward",
+ "alert.delete-success": "Nagrada je uspešno izbrisana",
"alert.no-inputs-found": "Illegal reward - no inputs found!",
- "alert.save-success": "Successfully saved rewards"
+ "alert.save-success": "Nagrada je uspešno shranjena"
}
\ No newline at end of file
diff --git a/public/language/sl/admin/extend/widgets.json b/public/language/sl/admin/extend/widgets.json
index ab9bfb4cdb..5564f020d0 100644
--- a/public/language/sl/admin/extend/widgets.json
+++ b/public/language/sl/admin/extend/widgets.json
@@ -1,26 +1,26 @@
{
- "available": "Available Widgets",
- "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.",
+ "available": "Razpoložljivi pripomočki",
+ "explanation": "V spustnem meniju izberite pripomoček in ga povlecite in spustite v območje gradnikov predloge na levi.",
"none-installed": "No widgets found! Activate the widget essentials plugin in the plugins control panel.",
- "clone-from": "Clone widgets from",
+ "clone-from": "Klonirajte pripomočke iz",
"containers.available": "Available Containers",
- "containers.explanation": "Drag and drop on top of any active widget",
- "containers.none": "None",
+ "containers.explanation": "Povlecite in spustite na kateri koli aktivni gradnik",
+ "containers.none": "Brez",
"container.well": "Well",
"container.jumbotron": "Jumbotron",
- "container.panel": "Panel",
- "container.panel-header": "Panel Header",
+ "container.panel": "plošča",
+ "container.panel-header": "Glava plošče",
"container.panel-body": "Panel Body",
- "container.alert": "Alert",
+ "container.alert": "Opozorilo",
- "alert.confirm-delete": "Are you sure you wish to delete this widget?",
- "alert.updated": "Widgets Updated",
- "alert.update-success": "Successfully updated widgets",
- "alert.clone-success": "Successfully cloned widgets",
+ "alert.confirm-delete": "Ste prepričani, da želite izbrisati ta pripomoček?",
+ "alert.updated": "Pripomočki so posodobljeni",
+ "alert.update-success": "Pripomočki so uspešno shranjeni",
+ "alert.clone-success": "Pripomočki so uspešno klonirani",
- "error.select-clone": "Please select a page to clone from",
+ "error.select-clone": "Izberite stran, s katere želite klonirati",
- "title": "Title",
+ "title": "Naslov",
"title.placeholder": "Title (only shown on some containers)",
"container": "Container",
"container.placeholder": "Drag and drop a container or enter HTML here.",
diff --git a/public/language/sl/admin/manage/categories.json b/public/language/sl/admin/manage/categories.json
index ed5462e9be..36eb291256 100644
--- a/public/language/sl/admin/manage/categories.json
+++ b/public/language/sl/admin/manage/categories.json
@@ -1,22 +1,22 @@
{
- "settings": "Category Settings",
+ "settings": "Nastavitve kategorije",
"privileges": "Privileges",
- "name": "Category Name",
- "description": "Category Description",
- "bg-color": "Background Colour",
- "text-color": "Text Colour",
+ "name": "Ime kategorije",
+ "description": "Opis kategorije",
+ "bg-color": "Barva ozadja",
+ "text-color": "Barva besedila",
"bg-image-size": "Background Image Size",
"custom-class": "Custom Class",
"num-recent-replies": "# of Recent Replies",
- "ext-link": "External Link",
- "subcategories-per-page": "Subcategories per page",
+ "ext-link": "Zunanja povezava",
+ "subcategories-per-page": "Podkategorij na stran",
"is-section": "Treat this category as a section",
- "post-queue": "Post queue",
+ "post-queue": "Čakalna vrsta objav",
"tag-whitelist": "Tag Whitelist",
- "upload-image": "Upload Image",
- "delete-image": "Remove",
- "category-image": "Category Image",
+ "upload-image": "Naloži sliko",
+ "delete-image": "Odstrani",
+ "category-image": "Slika kategorije",
"parent-category": "Parent Category",
"optional-parent-category": "(Optional) Parent Category",
"top-level": "Top Level",
@@ -27,15 +27,15 @@
"clone-children": "Clone Children Categories And Settings",
"purge": "Purge Category",
- "enable": "Enable",
- "disable": "Disable",
+ "enable": "Omogoči",
+ "disable": "Onemogoči",
"edit": "Edit",
"analytics": "Analytics",
- "view-category": "View category",
- "set-order": "Set order",
- "set-order-help": "Setting the order of the category will move this category to that order and update the order of other categories as necessary. Minimum order is 1 which puts the category at the top.",
+ "view-category": "Poglej kategorijo",
+ "set-order": "Nastavi vrstni red",
+ "set-order-help": "Če nastavite vrstni red kategorije, se bo ta kategorija premaknila in po potrebi posodobila vrstni red drugih kategorij. Najmanjša št. vrstnega reda je 1, kar kategorijo postavlja na vrh.",
- "select-category": "Select Category",
+ "select-category": "Izberi kategorijo",
"set-parent-category": "Set Parent Category",
"privileges.description": "You can configure the access control privileges for portions of the site in this section. Privileges can be granted on a per-user or a per-group basis. Select the domain of effect from the dropdown below.",
@@ -45,48 +45,48 @@
"privileges.section-posting": "Posting Privileges",
"privileges.section-moderation": "Moderation Privileges",
"privileges.section-other": "Other",
- "privileges.section-user": "User",
- "privileges.search-user": "Add User",
+ "privileges.section-user": "Uporabnik",
+ "privileges.search-user": "Dodaj uporabnika",
"privileges.no-users": "No user-specific privileges in this category.",
- "privileges.section-group": "Group",
- "privileges.group-private": "This group is private",
+ "privileges.section-group": "Skupina",
+ "privileges.group-private": "Ta skupina je zasebna",
"privileges.inheritance-exception": "This group does not inherit privileges from registered-users group",
"privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group",
- "privileges.search-group": "Add Group",
+ "privileges.search-group": "Dodaj skupino",
"privileges.copy-to-children": "Copy to Children",
- "privileges.copy-from-category": "Copy from Category",
- "privileges.copy-privileges-to-all-categories": "Copy to All Categories",
+ "privileges.copy-from-category": "Kopiraj iz kategorije",
+ "privileges.copy-privileges-to-all-categories": "Kopiraj v vse kategorije",
"privileges.copy-group-privileges-to-children": "Copy this group's privileges to the children of this category.",
"privileges.copy-group-privileges-to-all-categories": "Copy this group's privileges to all categories.",
"privileges.copy-group-privileges-from": "Copy this group's privileges from another category.",
"privileges.inherit": "If the registered-users group is granted a specific privilege, all other groups receive an implicit privilege, even if they are not explicitly defined/checked. This implicit privilege is shown to you because all users are part of the registered-users user group, and so, privileges for additional groups need not be explicitly granted.",
"privileges.copy-success": "Privileges copied!",
- "analytics.back": "Back to Categories List",
+ "analytics.back": "Nazaj na seznam kategorij",
"analytics.title": "Analytics for \"%1\" category",
"analytics.pageviews-hourly": "Figure 1 – Hourly page views for this category",
"analytics.pageviews-daily": "Figure 2 – Daily page views for this category",
"analytics.topics-daily": "Figure 3 – Daily topics created in this category",
"analytics.posts-daily": "Figure 4 – Daily posts made in this category",
- "alert.created": "Created",
- "alert.create-success": "Category successfully created!",
- "alert.none-active": "You have no active categories.",
- "alert.create": "Create a Category",
+ "alert.created": "Ustvarjeno",
+ "alert.create-success": "Kategorija je uspešno ustvarjena!",
+ "alert.none-active": "Nimate aktivnih kategorij.",
+ "alert.create": "Ustvari kategorijo",
"alert.confirm-purge": "Do you really want to purge this category \"%1\"?
Warning! All topics and posts in this category will be purged!
Purging a category will remove all topics and posts, and delete the category from the database. If you want to remove a category temporarily, you'll want to \"disable\" the category instead.
",
"alert.purge-success": "Category purged!",
"alert.copy-success": "Settings Copied!",
"alert.set-parent-category": "Set Parent Category",
- "alert.updated": "Updated Categories",
+ "alert.updated": "Posodobljene kategorije",
"alert.updated-success": "Category IDs %1 successfully updated.",
- "alert.upload-image": "Upload category image",
- "alert.find-user": "Find a User",
+ "alert.upload-image": "Naloži sliko kategorije",
+ "alert.find-user": "Poišči uporabnika",
"alert.user-search": "Search for a user here...",
- "alert.find-group": "Find a Group",
+ "alert.find-group": "Poišči skupino",
"alert.group-search": "Search for a group here...",
"alert.not-enough-whitelisted-tags": "Whitelisted tags are less than minimum tags, you need to create more whitelisted tags!",
- "collapse-all": "Collapse All",
- "expand-all": "Expand All",
+ "collapse-all": "Strni vse",
+ "expand-all": "Razširi vse",
"disable-on-create": "Disable on create",
- "no-matches": "No matches"
+ "no-matches": "Ni zadetkov"
}
\ No newline at end of file
diff --git a/public/language/sl/admin/manage/digest.json b/public/language/sl/admin/manage/digest.json
index 8f3661698a..7698903956 100644
--- a/public/language/sl/admin/manage/digest.json
+++ b/public/language/sl/admin/manage/digest.json
@@ -1,11 +1,11 @@
{
"lead": "A listing of digest delivery stats and times is displayed below.",
- "disclaimer": "Please be advised that email delivery is not guaranteed, due to the nature of email technology. Many variables factor into whether an email sent to the recipient server is ultimately delivered into the user's inbox, including server reputation, blacklisted IP addresses, and whether DKIM/SPF/DMARC is configured.",
- "disclaimer-continued": "A successful delivery means the message was sent successfully by NodeBB and acknowledged by the recipient server. It does not mean the email landed in the inbox. For best results, we recommend using a third-party email delivery service such as SendGrid.",
+ "disclaimer": "Upoštevajte, da dostava elektronske pošte zaradi narave tehnologije e-pošte ni zagotovljena. Številne spremenljivke vplivajo na to, ali je e-poštno sporočilo, poslano prejemniškemu strežniku, na koncu dostavljeno v mapo »Prejeto«, vključno z ugledom strežnika, naslovi IP na črnem seznamu in ali je konfiguriran DKIM/SPF/DMARC.",
+ "disclaimer-continued": "Uspešna dostava pomeni, da je NodeBB uspešno poslal sporočilo in ga je strežnik prejemnika potrdil. To ne pomeni, da je e-poštno sporočilo prispelo v mapo »Prejeto«. Za najboljše rezultate priporočamo uporabo storitev dostave e-pošte tretjih oseb, kot je npr SendGrid.",
- "user": "User",
- "subscription": "Subscription Type",
- "last-delivery": "Last successful delivery",
+ "user": "Uporabnik",
+ "subscription": "Vrsta naročnine",
+ "last-delivery": "Zadnja uspešna dostava",
"default": "System default",
"default-help": "System default means the user has not explicitly overridden the global forum setting for digests, which is currently: "%1"",
"resend": "Resend Digest",
diff --git a/public/language/sl/admin/manage/groups.json b/public/language/sl/admin/manage/groups.json
index 911fcce010..f24abd0371 100644
--- a/public/language/sl/admin/manage/groups.json
+++ b/public/language/sl/admin/manage/groups.json
@@ -1,44 +1,44 @@
{
- "name": "Group Name",
- "badge": "Badge",
- "properties": "Properties",
- "description": "Group Description",
- "member-count": "Member Count",
- "system": "System",
- "hidden": "Hidden",
- "private": "Private",
- "edit": "Edit",
- "delete": "Delete",
+ "name": "Ime skupine",
+ "badge": "Značka",
+ "properties": "Lastnosti",
+ "description": "Opis skupine",
+ "member-count": "Število članov",
+ "system": "Sistem",
+ "hidden": "Skrita",
+ "private": "Zasebna",
+ "edit": "Uredi",
+ "delete": "Izbriši",
"privileges": "Privileges",
"download-csv": "CSV",
"search-placeholder": "Search",
- "create": "Create Group",
- "description-placeholder": "A short description about your group",
- "create-button": "Create",
+ "create": "Ustvari skupino",
+ "description-placeholder": "Kratki opis vaše skupine",
+ "create-button": "Ustvari",
"alerts.create-failure": "Uh-OhThere was a problem creating your group. Please try again later!
",
- "alerts.confirm-delete": "Are you sure you wish to delete this group?",
+ "alerts.confirm-delete": "Ste prepričani, da želite izbrisati to skupino?",
- "edit.name": "Name",
- "edit.description": "Description",
+ "edit.name": "Ime",
+ "edit.description": "Opis",
"edit.user-title": "Title of Members",
- "edit.icon": "Group Icon",
- "edit.label-color": "Group Label Color",
- "edit.text-color": "Group Text Color",
- "edit.show-badge": "Show Badge",
- "edit.private-details": "If enabled, joining of groups requires approval from a group owner.",
- "edit.private-override": "Warning: Private groups is disabled at system level, which overrides this option.",
- "edit.disable-join": "Disable join requests",
- "edit.disable-leave": "Disallow users from leaving the group",
- "edit.hidden": "Hidden",
- "edit.hidden-details": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
- "edit.add-user": "Add User to Group",
- "edit.add-user-search": "Search Users",
- "edit.members": "Member List",
- "control-panel": "Groups Control Panel",
- "revert": "Revert",
+ "edit.icon": "Ikona skupine",
+ "edit.label-color": "Barva oznake skupine",
+ "edit.text-color": "Barva besedila skupine",
+ "edit.show-badge": "Prikaži značko",
+ "edit.private-details": "Če je omogočeno, je za pridružitev skupinam potrebna odobritev lastnika skupine.",
+ "edit.private-override": "Opozorilo: Zasebne skupine so onemogočene na sistemski ravni, kar preglasi to možnost.",
+ "edit.disable-join": "Onemogoči povabila za pridružitev",
+ "edit.disable-leave": "Ne dovoli uporabnikom, da zapustijo skupino",
+ "edit.hidden": "Skrito",
+ "edit.hidden-details": "Če je omogočeno, te skupine ne boste našli na seznamu skupin, uporabnike pa boste morali povabiti ročno",
+ "edit.add-user": "Dodaj uporabnika v skupino",
+ "edit.add-user-search": "Iskanje uporabnikov",
+ "edit.members": "Seznam članov",
+ "control-panel": "Nadzorna plošča skupine",
+ "revert": "Povrni",
- "edit.no-users-found": "No Users Found",
- "edit.confirm-remove-user": "Are you sure you want to remove this user?",
- "edit.save-success": "Changes saved!"
+ "edit.no-users-found": "Uporabnikov ni bilo mogoče najti",
+ "edit.confirm-remove-user": "Ste prepričani, da želite odstraniti tega uporabnika?",
+ "edit.save-success": "Spremembe so shranjene!"
}
\ No newline at end of file
diff --git a/public/language/sl/admin/manage/privileges.json b/public/language/sl/admin/manage/privileges.json
index 8b38b368cd..c7b819fe2e 100644
--- a/public/language/sl/admin/manage/privileges.json
+++ b/public/language/sl/admin/manage/privileges.json
@@ -4,16 +4,16 @@
"group-privileges": "Group Privileges",
"user-privileges": "User Privileges",
"edit-privileges": "Edit Privileges",
- "select-clear-all": "Select/Clear All",
- "chat": "Chat",
- "upload-images": "Upload Images",
- "upload-files": "Upload Files",
- "signature": "Signature",
+ "select-clear-all": "Izberi/Počisti vse",
+ "chat": "Klepet",
+ "upload-images": "Naloži slike",
+ "upload-files": "Naloži datoteke",
+ "signature": "Podpis",
"ban": "Ban",
- "invite": "Invite",
- "search-content": "Search Content",
- "search-users": "Search Users",
- "search-tags": "Search Tags",
+ "invite": "Povabi",
+ "search-content": "Išči vsebino",
+ "search-users": "Išči uporabnike",
+ "search-tags": "Išči oznake",
"view-users": "View Users",
"view-tags": "View Tags",
"view-groups": "View Groups",
@@ -23,27 +23,27 @@
"find-category": "Find Category",
"access-category": "Access Category",
"access-topics": "Access Topics",
- "create-topics": "Create Topics",
- "reply-to-topics": "Reply to Topics",
+ "create-topics": "Ustvari teme",
+ "reply-to-topics": "Odgovori na teme",
"schedule-topics": "Schedule Topics",
- "tag-topics": "Tag Topics",
- "edit-posts": "Edit Posts",
- "view-edit-history": "View Edit History",
- "delete-posts": "Delete Posts",
+ "tag-topics": "Označi teme",
+ "edit-posts": "Uredi objave",
+ "view-edit-history": "Poglej zgodovino urejanja",
+ "delete-posts": "Izbriši objave",
"view_deleted": "View Deleted Posts",
"upvote-posts": "Upvote Posts",
"downvote-posts": "Downvote Posts",
- "delete-topics": "Delete Topics",
+ "delete-topics": "Izbriši teme",
"purge": "Purge",
"moderate": "Moderate",
"admin-dashboard": "Dashboard",
- "admin-categories": "Categories",
+ "admin-categories": "Kategorije",
"admin-privileges": "Privileges",
- "admin-users": "Users",
+ "admin-users": "Uporabniki",
"admin-admins-mods": "Admins & Mods",
- "admin-groups": "Groups",
- "admin-tags": "Tags",
- "admin-settings": "Settings",
+ "admin-groups": "Skupine",
+ "admin-tags": "Oznake",
+ "admin-settings": "Nastavitve",
"alert.confirm-moderate": "Are you sure you wish to grant the moderation privilege to this user group? This group is public, and any users can join at will.",
"alert.confirm-admins-mods": "Are you sure you wish to grant the "Admins & Mods" privilege to this user/group? Users with this privilege are able to promote and demote other users into privileged positions, including super administrator",
diff --git a/public/language/sl/admin/manage/registration.json b/public/language/sl/admin/manage/registration.json
index 87d4f07d10..3cc776fd0c 100644
--- a/public/language/sl/admin/manage/registration.json
+++ b/public/language/sl/admin/manage/registration.json
@@ -1,6 +1,6 @@
{
"queue": "Čakalna vrsta",
- "description": "V čakalni vrsti za registracijo ni nobenega uporabnika.
Da omogočite to funkcionalnost, pojdite na Nastavitve → Uporabnik → Registracija Uporabnika in nastavitev Tip registracijev \"Admin Odobravanje\".",
+ "description": "V čakalni vrsti registracij ni nobenega uporabnika.
Da omogočite to funkcionalnost, pojdite na Nastavitve → Uporabnik → Registracija Uporabnika in nastavitev Tip registracijev \"Admin Odobravanje\".",
"list.name": "Ime",
"list.email": "E-pošta",
diff --git a/public/language/sl/admin/manage/tags.json b/public/language/sl/admin/manage/tags.json
index 01363dfda0..c2774f3284 100644
--- a/public/language/sl/admin/manage/tags.json
+++ b/public/language/sl/admin/manage/tags.json
@@ -1,18 +1,18 @@
{
- "none": "Your forum does not have any topics with tags yet.",
- "bg-color": "Background Colour",
- "text-color": "Text Colour",
+ "none": "Na vašem forumu še ni nobene teme z oznakami.",
+ "bg-color": "Barva ozadja",
+ "text-color": "Barva besedila",
"description": "Select tags by clicking or dragging, use CTRL to select multiple tags.",
- "create": "Create Tag",
- "modify": "Modify Tags",
- "rename": "Rename Tags",
- "delete": "Delete Selected Tags",
- "search": "Search for tags...",
- "settings": "Tags Settings",
- "name": "Tag Name",
+ "create": "Ustvari oznako",
+ "modify": "Spremeni oznake",
+ "rename": "Preimenuj oznake",
+ "delete": "Izbriši izbrane oznake",
+ "search": "Iskanje oznak...",
+ "settings": "Nastavitve oznak",
+ "name": "Ime oznake",
- "alerts.editing": "Editing tag(s)",
- "alerts.confirm-delete": "Do you want to delete the selected tags?",
- "alerts.update-success": "Tag Updated!",
- "reset-colors": "Reset colors"
+ "alerts.editing": "Urejanje oznak(e)",
+ "alerts.confirm-delete": "Ali želite izbrisati izbrane oznake?",
+ "alerts.update-success": "Oznaka je posodobljena!",
+ "reset-colors": "Ponastavi barve"
}
\ No newline at end of file
diff --git a/public/language/sl/admin/manage/uploads.json b/public/language/sl/admin/manage/uploads.json
index 72a695ccdc..3fc7b46495 100644
--- a/public/language/sl/admin/manage/uploads.json
+++ b/public/language/sl/admin/manage/uploads.json
@@ -1,11 +1,11 @@
{
- "upload-file": "Upload File",
- "filename": "Filename",
+ "upload-file": "Naloži datoteko",
+ "filename": "Ime datoteke",
"usage": "Post Usage",
"orphaned": "Orphaned",
- "size/filecount": "Size / Filecount",
- "confirm-delete": "Do you really want to delete this file?",
- "filecount": "%1 files",
- "new-folder": "New Folder",
- "name-new-folder": "Enter a name for new the folder"
+ "size/filecount": "Velikost / Število datotek",
+ "confirm-delete": "Ste prepričani, da želite izbrisati to datoteko?",
+ "filecount": "%1 datotek",
+ "new-folder": "Nova mapa",
+ "name-new-folder": "Vnesite ime nove mape"
}
\ No newline at end of file
diff --git a/public/language/sl/admin/manage/users.json b/public/language/sl/admin/manage/users.json
index 38a065b954..20d9d392a4 100644
--- a/public/language/sl/admin/manage/users.json
+++ b/public/language/sl/admin/manage/users.json
@@ -1,70 +1,70 @@
{
- "users": "Users",
- "edit": "Actions",
+ "users": "Uporabniki",
+ "edit": "Dejanja",
"make-admin": "Make Admin",
"remove-admin": "Remove Admin",
- "validate-email": "Validate Email",
- "send-validation-email": "Send Validation Email",
- "password-reset-email": "Send Password Reset Email",
- "force-password-reset": "Force Password Reset & Log User Out",
- "ban": "Ban User(s)",
- "temp-ban": "Ban User(s) Temporarily",
- "unban": "Unban User(s)",
- "reset-lockout": "Reset Lockout",
+ "validate-email": "Potrdite e-poštni naslov",
+ "send-validation-email": "Pošljite potrditveno e-sporočilo",
+ "password-reset-email": "Pošljite e-poštno sporočilo za ponastavitev gesla",
+ "force-password-reset": "Vsilite ponastavitev gesla in odjavo uporabnika",
+ "ban": "Prepovejte uporabnika(e)",
+ "temp-ban": "Začasno prepovejte uporabnika(e)",
+ "unban": "Razveljavi prepoved uporabnika(ov)",
+ "reset-lockout": "Ponastavitev zaklepanja",
"reset-flags": "Reset Flags",
- "delete": "Delete User(s)",
- "delete-content": "Delete User(s) Content",
- "purge": "Delete User(s) and Content",
- "download-csv": "Download CSV",
- "manage-groups": "Manage Groups",
- "add-group": "Add Group",
- "invite": "Invite",
- "new": "New User",
- "filter-by": "Filter by",
- "pills.unvalidated": "Not Validated",
- "pills.validated": "Validated",
- "pills.banned": "Banned",
+ "delete": "Izbrišiteuporabnika(e)",
+ "delete-content": "Izbrišite Vsebino uporabnika(ov)",
+ "purge": "Izbrišiteuporabnika(e) in vsebino",
+ "download-csv": "Prenesite CSV",
+ "manage-groups": "Upravljaj skupine",
+ "add-group": "Dodaj skupino",
+ "invite": "Povabi",
+ "new": "Nov uporabnik",
+ "filter-by": "Filtriraj po",
+ "pills.unvalidated": "Nepotrjeno",
+ "pills.validated": "Potrjeno",
+ "pills.banned": "Prepovedano",
- "50-per-page": "50 per page",
- "100-per-page": "100 per page",
- "250-per-page": "250 per page",
- "500-per-page": "500 per page",
+ "50-per-page": "50 na stran",
+ "100-per-page": "100 na stran",
+ "250-per-page": "250 na stran",
+ "500-per-page": "500 na stran",
- "search.uid": "By User ID",
- "search.uid-placeholder": "Enter a user ID to search",
- "search.username": "By User Name",
- "search.username-placeholder": "Enter a username to search",
- "search.email": "By Email",
- "search.email-placeholder": "Enter a email to search",
- "search.ip": "By IP Address",
- "search.ip-placeholder": "Enter an IP Address to search",
- "search.not-found": "User not found!",
+ "search.uid": "Po ID uporabnika",
+ "search.uid-placeholder": "Za iskanje vnesite ID uporabnika",
+ "search.username": "Po imenu uporabnika",
+ "search.username-placeholder": "Za iskanje vnesite uporabniško ime",
+ "search.email": "Po e-poštnem naslovu",
+ "search.email-placeholder": "Za iskanje vnesite e-poštni naslov",
+ "search.ip": "Po IP naslovu",
+ "search.ip-placeholder": "Za iskanje vnesite IP naslov",
+ "search.not-found": "Uporabnika ni bilo mogoče najti!",
"inactive.3-months": "3 months",
"inactive.6-months": "6 months",
"inactive.12-months": "12 months",
"users.uid": "uid",
- "users.username": "username",
- "users.email": "email",
+ "users.username": "uporabniško ime",
+ "users.email": "e-poštni naslov",
"users.ip": "IP",
"users.postcount": "postcount",
- "users.reputation": "reputation",
+ "users.reputation": "ugled",
"users.flags": "flags",
"users.joined": "joined",
"users.last-online": "last online",
"users.banned": "banned",
- "create.username": "User Name",
- "create.email": "Email",
- "create.email-placeholder": "Email of this user",
- "create.password": "Password",
- "create.password-confirm": "Confirm Password",
+ "create.username": "Ime uporabnika",
+ "create.email": "E-poštni naslov",
+ "create.email-placeholder": "E-poštni naslov tega uporabnika",
+ "create.password": "Geslo",
+ "create.password-confirm": "Potrdi geslo",
"temp-ban.length": "Ban Length",
"temp-ban.reason": "Reason (Optional)",
- "temp-ban.hours": "Hours",
- "temp-ban.days": "Days",
+ "temp-ban.hours": "Ur",
+ "temp-ban.days": "Dni",
"temp-ban.explanation": "Enter the length of time for the ban. Note that a time of 0 will be a considered a permanent ban.",
"alerts.confirm-ban": "Do you really want to ban this user permanently?",
@@ -74,36 +74,36 @@
"alerts.unban-success": "User(s) unbanned!",
"alerts.lockout-reset-success": "Lockout(s) reset!",
"alerts.flag-reset-success": "Flags(s) reset!",
- "alerts.no-remove-yourself-admin": "You can't remove yourself as Administrator!",
- "alerts.make-admin-success": "User is now administrator.",
- "alerts.confirm-remove-admin": "Do you really want to remove this administrator?",
- "alerts.remove-admin-success": "User is no longer administrator.",
+ "alerts.no-remove-yourself-admin": "Sebe kot skrbnika ne morete odstraniti!",
+ "alerts.make-admin-success": "Uporabnik je sedaj skrbnik.",
+ "alerts.confirm-remove-admin": "Ste prepričani, da želite odstraniti tega skrbnika?",
+ "alerts.remove-admin-success": "Uporabnik ni več skrbnik.",
"alerts.make-global-mod-success": "User is now global moderator.",
"alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?",
"alerts.remove-global-mod-success": "User is no longer global moderator.",
"alerts.make-moderator-success": "User is now moderator.",
"alerts.confirm-remove-moderator": "Do you really want to remove this moderator?",
"alerts.remove-moderator-success": "User is no longer moderator.",
- "alerts.confirm-validate-email": "Do you want to validate email(s) of these user(s)?",
- "alerts.confirm-force-password-reset": "Are you sure you want to force the password reset and log out these user(s)?",
- "alerts.validate-email-success": "Emails validated",
- "alerts.validate-force-password-reset-success": "User(s) passwords have been reset and their existing sessions have been revoked.",
- "alerts.password-reset-confirm": "Do you want to send password reset email(s) to these user(s)?",
- "alerts.confirm-delete": "Warning!Do you really want to delete user(s)?
This action is not reversible! Only the user account will be deleted, their posts and topics will remain.
",
- "alerts.delete-success": "User(s) Deleted!",
+ "alerts.confirm-validate-email": "Ali želite potrditi e-poštni(e) naslov(e) tega/teh uporabnika(ov)?",
+ "alerts.confirm-force-password-reset": "Ali ste prepričani, da želite vsiliti ponastavitev gesla in odjaviti te(ga) uporabnika(e)?",
+ "alerts.validate-email-success": "E-poštni naslovi so potrjeni",
+ "alerts.validate-force-password-reset-success": "Gesla uporabnikov so bila ponastavljena in obstoječe seje preklicane.",
+ "alerts.password-reset-confirm": "Ali želite poslati e-poštno sporočilo za obnovitev gesla temu/tem uporabniku(om)?",
+ "alerts.confirm-delete": "Opozorilo!Ali res želite izbrisati uporabnika(e)?
Tega dejanja ni mogoče razveljaviti! Izbrisan bo samo uporabniški račun, njegove objave in teme bodo ostale.
\n",
+ "alerts.delete-success": "Uporabnik(i) je/so izbrisan(i)!",
"alerts.confirm-delete-content": "Warning!Do you really want to delete these user(s) content?
This action is not reversible! The users' accounts will remain, but their posts and topics will be deleted.
",
- "alerts.delete-content-success": "User(s) Content Deleted!",
+ "alerts.delete-content-success": "Vsebina uporabnika(ov) je izbrisana!",
"alerts.confirm-purge": "Warning!Do you really want to delete user(s) and their content?
This action is not reversible! All user data and content will be erased!
",
- "alerts.create": "Create User",
- "alerts.button-create": "Create",
- "alerts.button-cancel": "Cancel",
- "alerts.error-passwords-different": "Passwords must match!",
- "alerts.error-x": "Error%1
",
- "alerts.create-success": "User created!",
+ "alerts.create": "Ustvari uporabnika",
+ "alerts.button-create": "Ustvari",
+ "alerts.button-cancel": "Prekliči",
+ "alerts.error-passwords-different": "Gesli se morata ujemati!",
+ "alerts.error-x": "Napaka%1
",
+ "alerts.create-success": "Uporabnik je ustvarjen!",
- "alerts.prompt-email": "Emails: ",
- "alerts.email-sent-to": "An invitation email has been sent to %1",
- "alerts.x-users-found": "%1 user(s) found, (%2 seconds)",
- "export-users-started": "Exporting users as csv, this might take a while. You will receive a notification when it is complete.",
- "export-users-completed": "Users exported as csv, click here to download."
+ "alerts.prompt-email": "E-poštni naslovi:",
+ "alerts.email-sent-to": "E -poštno sporočilo s povabilom je bilo poslano %1",
+ "alerts.x-users-found": "%1 najdenih uporabnik(ov), (%2 sekund)",
+ "export-users-started": "Izvoz uporabnikov kot CSV lahko traja nekaj časa. Ko bo končano, boste prejeli obvestilo.",
+ "export-users-completed": "Uporabniki, izvoženi kot CSV, kliknite tukaj za prenos."
}
\ No newline at end of file
diff --git a/public/language/sl/admin/menu.json b/public/language/sl/admin/menu.json
index 1c5ea73b4f..e9734fac37 100644
--- a/public/language/sl/admin/menu.json
+++ b/public/language/sl/admin/menu.json
@@ -1,82 +1,82 @@
{
"section-dashboard": "Dashboards",
"dashboard/overview": "Overview",
- "dashboard/logins": "Logins",
- "dashboard/users": "Users",
- "dashboard/topics": "Topics",
- "section-general": "General",
+ "dashboard/logins": "Prijave",
+ "dashboard/users": "Uporabniki",
+ "dashboard/topics": "Teme",
+ "section-general": "Splošno",
- "section-manage": "Manage",
- "manage/categories": "Categories",
+ "section-manage": "Upravljaj",
+ "manage/categories": "Kategorije",
"manage/privileges": "Privileges",
- "manage/tags": "Tags",
- "manage/users": "Users",
+ "manage/tags": "Oznake",
+ "manage/users": "Uporabniki",
"manage/admins-mods": "Admins & Mods",
- "manage/registration": "Registration Queue",
- "manage/post-queue": "Post Queue",
- "manage/groups": "Groups",
- "manage/ip-blacklist": "IP Blacklist",
+ "manage/registration": "Čakalna vrsta registracij",
+ "manage/post-queue": "Čakalna vrsta objav",
+ "manage/groups": "Skupine",
+ "manage/ip-blacklist": "IP črna lista",
"manage/uploads": "Uploads",
"manage/digest": "Digests",
- "section-settings": "Settings",
- "settings/general": "General",
- "settings/homepage": "Home Page",
- "settings/navigation": "Navigation",
- "settings/reputation": "Reputation & Flags",
- "settings/email": "Email",
- "settings/user": "Users",
- "settings/group": "Groups",
- "settings/guest": "Guests",
+ "section-settings": "Nastavitve",
+ "settings/general": "Splošno",
+ "settings/homepage": "Domača stran",
+ "settings/navigation": "Krmarjenje",
+ "settings/reputation": "Ugled in zastavice",
+ "settings/email": "E-pošta",
+ "settings/user": "Uporabniki",
+ "settings/group": "Skupine",
+ "settings/guest": "Gostje",
"settings/uploads": "Uploads",
- "settings/languages": "Languages",
- "settings/post": "Posts",
- "settings/chat": "Chats",
- "settings/pagination": "Pagination",
- "settings/tags": "Tags",
- "settings/notifications": "Notifications",
+ "settings/languages": "Jeziki",
+ "settings/post": "Objave",
+ "settings/chat": "Klepeti",
+ "settings/pagination": "Številčenje strani",
+ "settings/tags": "Oznake",
+ "settings/notifications": "Obvestila",
"settings/api": "API Access",
- "settings/sounds": "Sounds",
+ "settings/sounds": "Zvoki",
"settings/social": "Social",
- "settings/cookies": "Cookies",
+ "settings/cookies": "Piškotki",
"settings/web-crawler": "Web Crawler",
- "settings/sockets": "Sockets",
- "settings/advanced": "Advanced",
+ "settings/sockets": "Vtičnice",
+ "settings/advanced": "Napredno",
- "settings.page-title": "%1 Settings",
+ "settings.page-title": "%1 nastavitve",
- "section-appearance": "Appearance",
- "appearance/themes": "Themes",
+ "section-appearance": "Videz",
+ "appearance/themes": "Teme",
"appearance/skins": "Skins",
"appearance/customise": "Custom Content (HTML/JS/CSS)",
"section-extend": "Extend",
- "extend/plugins": "Plugins",
+ "extend/plugins": "Vtičniki",
"extend/widgets": "Widgets",
- "extend/rewards": "Rewards",
+ "extend/rewards": "Nagrade",
"section-social-auth": "Social Authentication",
- "section-plugins": "Plugins",
- "extend/plugins.install": "Install Plugins",
+ "section-plugins": "Vtičniki",
+ "extend/plugins.install": "Namesti vtičnike",
- "section-advanced": "Advanced",
- "advanced/database": "Database",
- "advanced/events": "Events",
+ "section-advanced": "Napredno",
+ "advanced/database": "Podatkovna baza",
+ "advanced/events": "Dogodki",
"advanced/hooks": "Hooks",
- "advanced/logs": "Logs",
- "advanced/errors": "Errors",
+ "advanced/logs": "Prijave",
+ "advanced/errors": "Napake",
"advanced/cache": "Cache",
"development/logger": "Logger",
"development/info": "Info",
"rebuild-and-restart-forum": "Rebuild & Restart Forum",
- "restart-forum": "Restart Forum",
- "logout": "Log out",
+ "restart-forum": "Ponovno zaženi forum",
+ "logout": "Odjavi se",
"view-forum": "View Forum",
"search.placeholder": "Press "/" to search for settings",
- "search.no-results": "No results...",
+ "search.no-results": "Ni rezultatov...",
"search.search-forum": "Search the forum for ",
"search.keep-typing": "Type more to see results...",
"search.start-typing": "Start typing to see results...",
@@ -84,5 +84,5 @@
"connection-lost": "Connection to %1 has been lost, attempting to reconnect...",
"alerts.version": "Running NodeBB v%1",
- "alerts.upgrade": "Upgrade to v%1"
+ "alerts.upgrade": "Nadgradi na v%1"
}
\ No newline at end of file
diff --git a/public/language/sl/admin/settings/advanced.json b/public/language/sl/admin/settings/advanced.json
index ce0782be9e..1ccc1a4752 100644
--- a/public/language/sl/admin/settings/advanced.json
+++ b/public/language/sl/admin/settings/advanced.json
@@ -1,9 +1,9 @@
{
- "maintenance-mode": "Maintenance Mode",
- "maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.",
- "maintenance-mode.status": "Maintenance Mode Status Code",
- "maintenance-mode.message": "Maintenance Message",
- "headers": "Headers",
+ "maintenance-mode": "Način vzdrževanja",
+ "maintenance-mode.help": "Ko je forum v načinu vzdrževanja, bodo vse zahteve preusmerjene na statično stran za shranjevanje. Skrbniki so izvzeti iz te preusmeritve in lahko normalno dostopajo do spletnega mesta.",
+ "maintenance-mode.status": "Koda stanja načina vzdrževanja",
+ "maintenance-mode.message": "Sporočilo o vzdrževanju",
+ "headers": "Glave",
"headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame",
"headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame",
"headers.csp-frame-ancestors-help": "'none', 'self'(default) or list of URIs to allow.",
@@ -16,28 +16,28 @@
"headers.acam": "Access-Control-Allow-Methods",
"headers.acah": "Access-Control-Allow-Headers",
"hsts": "Strict Transport Security",
- "hsts.enabled": "Enabled HSTS (recommended)",
+ "hsts.enabled": "Omogočen HSTS (priporočeno)",
"hsts.maxAge": "HSTS Max Age",
- "hsts.subdomains": "Include subdomains in HSTS header",
- "hsts.preload": "Allow preloading of HSTS header",
- "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ",
- "traffic-management": "Traffic Management",
- "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
- "traffic.enable": "Enable Traffic Management",
+ "hsts.subdomains": "V glavo HSTS vključi poddomene",
+ "hsts.preload": "Dovoli prednalaganje glave HSTS",
+ "hsts.help": "Če je omogočeno, bo za to spletno mesto nastavljena glava HSTS. Lahko se odločite za vključitev poddomen in zastavic za vnaprejšnje nalaganje v glavo. Če ste v dvomih, jih lahko pustite neoznačene. Več informacij ",
+ "traffic-management": "Upravljanje prometa",
+ "traffic.help": "NodeBB uporablja modul, ki v situacijah z velikim prometom samodejno zavrne zahteve. Tu lahko prilagajate te nastavitve, čeprav so privzete nastavitve dobro izhodišče.",
+ "traffic.enable": "Omogoči upravljanje prometa",
"traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)",
- "traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)",
+ "traffic.event-lag-help": "Z znižanjem te vrednosti se skrajšajo čakalne dobe za nalaganje strani, hkrati pa bo več uporabnikom prikazano sporočilo »čezmerna obremenitev«. (Potreben ponovni zagon)",
"traffic.lag-check-interval": "Check Interval (in milliseconds)",
"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)",
"sockets.settings": "WebSocket Settings",
"sockets.max-attempts": "Max Reconnection Attempts",
- "sockets.default-placeholder": "Default: %1",
+ "sockets.default-placeholder": "Privzeto: %1",
"sockets.delay": "Reconnection Delay",
"analytics.settings": "Analytics Settings",
"analytics.max-cache": "Analytics Cache Max Value",
- "analytics.max-cache-help": "On high-traffic installs, the cache could be exhausted continuously if there are more concurrent active users than the Max Cache value. (Restart required)",
- "compression.settings": "Compression Settings",
- "compression.enable": "Enable Compression",
- "compression.help": "This setting enables gzip compression. For a high-traffic website in production, the best way to put compression in place is to implement it at a reverse proxy level. You can enable it here for testing purposes."
+ "analytics.max-cache-help": "Pri namestitvah z velikim prometom bi se lahko predpomnilnik neprestano izčrpal, če je hkrati aktivnih uporabnikov več kot je največja vrednost predpomnilnika. (Potreben ponovni zagon)",
+ "compression.settings": "Nastavitve stiskanja",
+ "compression.enable": "Omogoči stiskanje",
+ "compression.help": "Ta nastavitev omogoča stiskanje GZIP. Za produkcijsko spletno mesto z velikim prometom je najboljši način za uvedbo stiskanja izvajanje na obratni ravni proxyja. Za namene testiranja ga lahko omogočite tukaj."
}
\ No newline at end of file
diff --git a/public/language/sl/admin/settings/api.json b/public/language/sl/admin/settings/api.json
index 50892925f3..01306f9cf2 100644
--- a/public/language/sl/admin/settings/api.json
+++ b/public/language/sl/admin/settings/api.json
@@ -1,16 +1,16 @@
{
- "tokens": "Tokens",
- "settings": "Settings",
- "lead-text": "From this page you can configure access to the Write API in NodeBB.",
- "intro": "By default, the Write API authenticates users based on their session cookie, but NodeBB also supports Bearer authentication via tokens generated via this page.",
- "docs": "Click here to access the full API specification",
+ "tokens": "Žetoni",
+ "settings": "Nastavitve",
+ "lead-text": "Na tej strani lahko konfigurirate dostop do API-ja za pisanje v NodeBB.",
+ "intro": "API za pisanje privzeto preverja uporabnike na podlagi njihovega piškotka seje, vendar NodeBB podpira tudi preverjanje pristnosti nosilca prek žetonov, ustvarjenih na tej strani.",
+ "docs": "Kliknite tukaj za dostop do celotne specifikacije API-ja",
- "require-https": "Require API usage via HTTPS only",
- "require-https-caveat": "Note: Some installations involving load balancers may proxy their requests to NodeBB using HTTP, in which case this option should remain disabled.",
+ "require-https": "Zahtevaj uporabo API samo prek protokola HTTPS",
+ "require-https-caveat": "Opomba: Nekatere namestitve, ki vključujejo izravnalnike obremenitve, lahko svoje zahteve posredujejo NodeBB prek protokola HTTP, v tem primeru bi morala ta možnost ostati onemogočena.",
- "uid": "User ID",
- "uid-help-text": "Specify a User ID to associate with this token. If the user ID is 0, it will be considered a master token, which can assume the identity of other users based on the _uid parameter",
- "description": "Description",
- "no-description": "No description specified.",
- "token-on-save": "Token will be generated once form is saved"
+ "uid": "ID uporabnika",
+ "uid-help-text": "Določite ID uporabnika, ki ga želite povezati s tem žetonom. Če je ID uporabnika 0, bo veljal za glavni žeton, ki lahko prevzame identiteto drugih uporabnikov na podlagi parametra _uid",
+ "description": "Opis",
+ "no-description": "Opis ni naveden.",
+ "token-on-save": "Žeton bo ustvarjen, ko bo obrazec shranjen"
}
\ No newline at end of file
diff --git a/public/language/sl/admin/settings/chat.json b/public/language/sl/admin/settings/chat.json
index 67898611e7..95d7342274 100644
--- a/public/language/sl/admin/settings/chat.json
+++ b/public/language/sl/admin/settings/chat.json
@@ -1,9 +1,9 @@
{
- "chat-settings": "Chat Settings",
- "disable": "Disable chat",
- "disable-editing": "Disable chat message editing/deletion",
+ "chat-settings": "Nastavitve klepeta",
+ "disable": "Onemogoči klepet",
+ "disable-editing": "Onemogoči urejanje/brisanje sporočila klepeta",
"disable-editing-help": "Administrators and global moderators are exempt from this restriction",
- "max-length": "Maximum length of chat messages",
+ "max-length": "Največja dolžina sporočila klepeta",
"max-room-size": "Maximum number of users in chat rooms",
"delay": "Time between chat messages in milliseconds",
"notification-delay": "Notification delay for chat messages. (0 for no delay)",
diff --git a/public/language/sl/admin/settings/cookies.json b/public/language/sl/admin/settings/cookies.json
index 1ffd2dced4..baea71728d 100644
--- a/public/language/sl/admin/settings/cookies.json
+++ b/public/language/sl/admin/settings/cookies.json
@@ -1,13 +1,13 @@
{
- "eu-consent": "EU Consent",
- "consent.enabled": "Enabled",
+ "eu-consent": "EU soglasje",
+ "consent.enabled": "Omogočeno",
"consent.message": "Notification message",
"consent.acceptance": "Acceptance message",
"consent.link-text": "Policy Link Text",
"consent.link-url": "Policy Link URL",
"consent.blank-localised-default": "Leave blank to use NodeBB localised defaults",
- "settings": "Settings",
+ "settings": "Nastavitve",
"cookie-domain": "Session cookie domain",
- "max-user-sessions": "Max active sessions per user",
- "blank-default": "Leave blank for default"
+ "max-user-sessions": "Največ aktivnih sej na uporabnika",
+ "blank-default": "Za privzeto pusti prazno"
}
\ No newline at end of file
diff --git a/public/language/sl/admin/settings/email.json b/public/language/sl/admin/settings/email.json
index 9bdbde26a6..af4e100eb6 100644
--- a/public/language/sl/admin/settings/email.json
+++ b/public/language/sl/admin/settings/email.json
@@ -37,6 +37,8 @@
"subscriptions.hour": "Digest Hour",
"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
"notifications.remove-images": "Remove images from email notifications",
+ "require-email-address": "Require new users to specify an email address",
+ "require-email-address-warning": "By default, users can opt-out of entering an email address. Enabling this option means they have to enter an email address in order to proceed with registration. It does not ensure user will enter a real email address, nor even an address they own.",
"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws."
}
\ No newline at end of file
diff --git a/public/language/sl/admin/settings/general.json b/public/language/sl/admin/settings/general.json
index be7df90870..dbb815b484 100644
--- a/public/language/sl/admin/settings/general.json
+++ b/public/language/sl/admin/settings/general.json
@@ -1,27 +1,27 @@
{
- "site-settings": "Site Settings",
- "title": "Site Title",
- "title.short": "Short Title",
- "title.short-placeholder": "If no short title is specified, the site title will be used",
+ "site-settings": "Nastavitve spletnega mesta",
+ "title": "Naslov spletnega mesta",
+ "title.short": "Kratki naslov",
+ "title.short-placeholder": "Če kratek naslov ni naveden, bo uporabljen naslov spletnega mesta",
"title.url": "URL",
- "title.url-placeholder": "The URL of the site title",
+ "title.url-placeholder": "URL naslova spletnega mesta",
"title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.",
- "title.name": "Your Community Name",
- "title.show-in-header": "Show Site Title in Header",
- "browser-title": "Browser Title",
- "browser-title-help": "If no browser title is specified, the site title will be used",
- "title-layout": "Title Layout",
+ "title.name": "Ime vaše skupnosti",
+ "title.show-in-header": "V glavi pokaži naslov strani",
+ "browser-title": "Naslov brskalnika",
+ "browser-title-help": "Če naslov brskalnika ni naveden, bo uporabljen naslov spletnega mesta",
+ "title-layout": "Postavitev naslova",
"title-layout-help": "Define how the browser title will be structured ie. {pageTitle} | {browserTitle}",
- "description.placeholder": "A short description about your community",
- "description": "Site Description",
- "keywords": "Site Keywords",
- "keywords-placeholder": "Keywords describing your community, comma-separated",
- "logo": "Site Logo",
- "logo.image": "Image",
- "logo.image-placeholder": "Path to a logo to display on forum header",
+ "description.placeholder": "Kratek opis vaše skupnosti",
+ "description": "Opis spletne strani",
+ "keywords": "Ključne besede spletnega mesta",
+ "keywords-placeholder": "Ključne besede, ki opisujejo vašo skupnost, ločene z vejicami",
+ "logo": "Logotip spletnega mesta",
+ "logo.image": "Slika",
+ "logo.image-placeholder": "Pot do logotipa za prikaz v glavi foruma",
"logo.upload": "Upload",
"logo.url": "URL",
- "logo.url-placeholder": "The URL of the site logo",
+ "logo.url-placeholder": "URL logotipa spletnega mesta",
"logo.url-help": "When the logo is clicked, send users to this address. If left blank, user will be sent to the forum index.",
"logo.alt-text": "Alt Text",
"log.alt-text-placeholder": "Alternative text for accessibility",
@@ -33,18 +33,18 @@
"touch-icon.help": "Recommended size and format: 512x512, PNG format only. If no touch icon is specified, NodeBB will fall back to using the favicon.",
"maskable-icon": "Maskable (Homescreen) Icon",
"maskable-icon.help": "Recommended size and format: 512x512, PNG format only. If no maskable icon is specified, NodeBB will fall back to the Touch Icon.",
- "outgoing-links": "Outgoing Links",
+ "outgoing-links": "Odhodne povezave",
"outgoing-links.warning-page": "Use Outgoing Links Warning Page",
- "search": "Search",
- "search-default-in": "Search In",
- "search-default-in-quick": "Quick Search In",
- "search-default-sort-by": "Sort by",
+ "search": "Išči",
+ "search-default-in": "Išči v",
+ "search-default-in-quick": "Hitro išči v",
+ "search-default-sort-by": "Razvrsti po",
"outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page",
- "site-colors": "Site Color Metadata",
- "theme-color": "Theme Color",
- "background-color": "Background Color",
- "background-color-help": "Color used for splash screen background when website is installed as a PWA",
- "undo-timeout": "Undo Timeout",
- "undo-timeout-help": "Some operations such as moving topics will allow for the moderator to undo their action within a certain timeframe. Set to 0 to disable undo completely.",
+ "site-colors": "Metapodatki o barvi spletnega mesta",
+ "theme-color": "Barva teme",
+ "background-color": "Barva ozadja",
+ "background-color-help": "Barva, ki se uporablja za ozadje začetnega zaslona, ko je spletno mesto nameščeno kot PWA",
+ "undo-timeout": "Razveljavi časovno omejitev",
+ "undo-timeout-help": "Nekatere operacije, kot so premikanje tem, bodo moderatorju omogočile, da v določenem časovnem okviru razveljavi svoje dejanje. Nastavite na 0, da popolnoma onemogočite razveljavitev.",
"topic-tools": "Topic Tools"
}
\ No newline at end of file
diff --git a/public/language/sl/admin/settings/group.json b/public/language/sl/admin/settings/group.json
index f13933ea7e..33c91eb310 100644
--- a/public/language/sl/admin/settings/group.json
+++ b/public/language/sl/admin/settings/group.json
@@ -1,6 +1,6 @@
{
- "general": "General",
- "private-groups": "Private Groups",
+ "general": "Splošno",
+ "private-groups": "Zasebne skupine",
"private-groups.help": "If enabled, joining of groups requires the approval of the group owner (Default: enabled)",
"private-groups.warning": "Beware! If this option is disabled and you have private groups, they automatically become public.",
"allow-multiple-badges": "Allow Multiple Badges",
diff --git a/public/language/sl/admin/settings/guest.json b/public/language/sl/admin/settings/guest.json
index 75d44f37e4..f0a17f7cfa 100644
--- a/public/language/sl/admin/settings/guest.json
+++ b/public/language/sl/admin/settings/guest.json
@@ -1,5 +1,5 @@
{
- "settings": "Settings",
+ "settings": "Nastavitve",
"handles.enabled": "Allow guest handles",
"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
"topic-views.enabled": "Allow guests to increase topic view counts",
diff --git a/public/language/sl/admin/settings/homepage.json b/public/language/sl/admin/settings/homepage.json
index 7428d59eeb..7198443b3b 100644
--- a/public/language/sl/admin/settings/homepage.json
+++ b/public/language/sl/admin/settings/homepage.json
@@ -1,8 +1,8 @@
{
- "home-page": "Home Page",
- "description": "Choose what page is shown when users navigate to the root URL of your forum.",
- "home-page-route": "Home Page Route",
- "custom-route": "Custom Route",
- "allow-user-home-pages": "Allow User Home Pages",
- "home-page-title": "Title of the home page (default \"Home\")"
+ "home-page": "Domača stran",
+ "description": "Izberite, katera stran se prikaže, ko se uporabniki pomaknejo do korenskega URL-ja vašega foruma.",
+ "home-page-route": "Pot do domače strani",
+ "custom-route": "Pot po meri",
+ "allow-user-home-pages": "Dovoli domače strani uporabnikov",
+ "home-page-title": "Naslov domače strani (privzeto »Domača stran«)"
}
\ No newline at end of file
diff --git a/public/language/sl/admin/settings/languages.json b/public/language/sl/admin/settings/languages.json
index bdd57849b3..311b4af2e7 100644
--- a/public/language/sl/admin/settings/languages.json
+++ b/public/language/sl/admin/settings/languages.json
@@ -1,6 +1,6 @@
{
- "language-settings": "Language Settings",
- "description": "The default language determines the language settings for all users who are visiting your forum.
Individual users can override the default language on their account settings page.",
- "default-language": "Default Language",
- "auto-detect": "Auto Detect Language Setting for Guests"
+ "language-settings": "Nastavitve jezika",
+ "description": "Privzeti jezik določa jezikovne nastavitve za vse uporabnike, ki obiščejo vaš forum.
Posamezni uporabniki lahko na strani z nastavitvami računa preglasijo privzeti jezik.",
+ "default-language": "Privzeti jezik",
+ "auto-detect": "Samodejna zaznava nastavitev jezika za goste"
}
\ No newline at end of file
diff --git a/public/language/sl/admin/settings/navigation.json b/public/language/sl/admin/settings/navigation.json
index 13dd01aae7..fc2c5f2946 100644
--- a/public/language/sl/admin/settings/navigation.json
+++ b/public/language/sl/admin/settings/navigation.json
@@ -1,23 +1,23 @@
{
- "icon": "Icon:",
+ "icon": "Ikona:",
"change-icon": "change",
- "route": "Route:",
+ "route": "Pot:",
"tooltip": "Tooltip:",
- "text": "Text:",
+ "text": "Besedilo:",
"text-class": "Text Class: optional",
"class": "Class: optional",
- "id": "ID: optional",
+ "id": "ID: izbirno",
- "properties": "Properties:",
- "groups": "Groups:",
- "open-new-window": "Open in a new window",
+ "properties": "Lastnosti:",
+ "groups": "Skupine",
+ "open-new-window": "Odpri v novem oknu",
- "btn.delete": "Delete",
- "btn.disable": "Disable",
- "btn.enable": "Enable",
+ "btn.delete": "Izbriši",
+ "btn.disable": "Onemogoči",
+ "btn.enable": "Omogoči",
- "available-menu-items": "Available Menu Items",
- "custom-route": "Custom Route",
- "core": "core",
- "plugin": "plugin"
+ "available-menu-items": "Razpoložljivi elementi menija",
+ "custom-route": "Pot po meri",
+ "core": "jedro",
+ "plugin": "vtičnik"
}
\ No newline at end of file
diff --git a/public/language/sl/admin/settings/notifications.json b/public/language/sl/admin/settings/notifications.json
index da6c9680a3..9d3be6c1de 100644
--- a/public/language/sl/admin/settings/notifications.json
+++ b/public/language/sl/admin/settings/notifications.json
@@ -1,6 +1,6 @@
{
- "notifications": "Notifications",
- "welcome-notification": "Welcome Notification",
- "welcome-notification-link": "Welcome Notification Link",
- "welcome-notification-uid": "Welcome Notification User (UID)"
+ "notifications": "Obvestila",
+ "welcome-notification": "Obvestilo o dobrodošlici",
+ "welcome-notification-link": "Povezava do obvestila o dobrodošlici",
+ "welcome-notification-uid": "Obvestilo o dobrodošlici za uporabnika (UID)"
}
\ No newline at end of file
diff --git a/public/language/sl/admin/settings/pagination.json b/public/language/sl/admin/settings/pagination.json
index 3bf306b2f9..fee948d2b5 100644
--- a/public/language/sl/admin/settings/pagination.json
+++ b/public/language/sl/admin/settings/pagination.json
@@ -1,12 +1,12 @@
{
- "pagination": "Pagination Settings",
- "enable": "Paginate topics and posts instead of using infinite scroll.",
- "posts": "Post Pagination",
- "topics": "Topic Pagination",
- "posts-per-page": "Posts per Page",
- "max-posts-per-page": "Maximum posts per page",
- "categories": "Category Pagination",
- "topics-per-page": "Topics per Page",
- "max-topics-per-page": "Maximum topics per page",
- "categories-per-page": "Categories per page"
+ "pagination": "Nastavitve številčenja",
+ "enable": "Namesto neskončnega drsenja uporabite številčenje tem in objav.",
+ "posts": "Številčenje objav",
+ "topics": "Številčenje tem",
+ "posts-per-page": "Objav na stran",
+ "max-posts-per-page": "Največ objav na stran",
+ "categories": "Številčenje kategorij",
+ "topics-per-page": "Tem na stran",
+ "max-topics-per-page": "Največ tem na stran",
+ "categories-per-page": "Kategorij na stran"
}
\ No newline at end of file
diff --git a/public/language/sl/admin/settings/post.json b/public/language/sl/admin/settings/post.json
index 27493aafbd..28b28bde7e 100644
--- a/public/language/sl/admin/settings/post.json
+++ b/public/language/sl/admin/settings/post.json
@@ -1,62 +1,62 @@
{
- "sorting": "Post Sorting",
- "sorting.post-default": "Default Post Sorting",
- "sorting.oldest-to-newest": "Oldest to Newest",
- "sorting.newest-to-oldest": "Newest to Oldest",
- "sorting.most-votes": "Most Votes",
- "sorting.most-posts": "Most Posts",
- "sorting.topic-default": "Default Topic Sorting",
- "length": "Post Length",
- "post-queue": "Post Queue",
- "restrictions": "Posting Restrictions",
- "restrictions-new": "New User Restrictions",
- "restrictions.post-queue": "Enable post queue",
- "restrictions.post-queue-rep-threshold": "Reputation required to bypass post queue",
- "restrictions.groups-exempt-from-post-queue": "Select groups that should be exempt from the post queue",
- "restrictions-new.post-queue": "Enable new user restrictions",
- "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval",
- "restrictions-new.post-queue-help": "Enabling new user restrictions will set restrictions on posts created by new users",
- "restrictions.seconds-between": "Number of seconds between posts",
- "restrictions.seconds-between-new": "Seconds between posts for new users",
+ "sorting": "Razvrščanje objav",
+ "sorting.post-default": "Privzeto razvrščanje objav",
+ "sorting.oldest-to-newest": "Najstarejše do najnovejše",
+ "sorting.newest-to-oldest": "Najnovejše do najstarejše",
+ "sorting.most-votes": "Največ glasov",
+ "sorting.most-posts": "Največ objav",
+ "sorting.topic-default": "Privzeto razvrščanje tem",
+ "length": "Dolžina objave",
+ "post-queue": "Čakalna vrsta objav",
+ "restrictions": "Omejitve objavljanja",
+ "restrictions-new": "Omejitve novega uporabnika",
+ "restrictions.post-queue": "Omogoči čakalno vrsto objav",
+ "restrictions.post-queue-rep-threshold": "Da se izogne čakalni vrsti objav je potreben ugled",
+ "restrictions.groups-exempt-from-post-queue": "Izberite skupine, ki bi morale biti izvzete iz čakalne vrste objav",
+ "restrictions-new.post-queue": "Omogoči omejitve novega uporabnika",
+ "restrictions.post-queue-help": "Če omogočite čakalno vrsto objav, bodo objave novih uporabnikov postavljene v čakalno vrsto za odobritev",
+ "restrictions-new.post-queue-help": "Omogočanje omejitev za nove uporabnike bo postavilo omejitve za objave novih uporabnikov",
+ "restrictions.seconds-between": "Število sekund med objavami",
+ "restrictions.seconds-between-new": "Sekunde med objavami za novega uporabnika",
"restrictions.rep-threshold": "Reputation threshold before these restrictions are lifted",
- "restrictions.seconds-before-new": "Seconds before a new user can make their first post",
- "restrictions.seconds-edit-after": "Number of seconds a post remains editable (set to 0 to disable)",
- "restrictions.seconds-delete-after": "Number of seconds a post remains deletable (set to 0 to disable)",
- "restrictions.replies-no-delete": "Number of replies after users are disallowed to delete their own topics (set to 0 to disable)",
- "restrictions.min-title-length": "Minimum Title Length",
- "restrictions.max-title-length": "Maximum Title Length",
- "restrictions.min-post-length": "Minimum Post Length",
- "restrictions.max-post-length": "Maximum Post Length",
- "restrictions.days-until-stale": "Days until topic is considered stale",
- "restrictions.stale-help": "If a topic is considered \"stale\", then a warning will be shown to users who attempt to reply to that topic.",
- "timestamp": "Timestamp",
- "timestamp.cut-off": "Date cut-off (in days)",
+ "restrictions.seconds-before-new": "Sekunde, preden lahko nov uporabnik objavi svojo prvo objavo",
+ "restrictions.seconds-edit-after": "Število sekund, ko je objavo še mogoče urejati (nastavite na 0, da onemogočite)",
+ "restrictions.seconds-delete-after": "Število sekund, ko je objavo še mogoče izbrisati (nastavite na 0, da onemogočite)",
+ "restrictions.replies-no-delete": "Število odgovorov, ko uporabnikom ni dovoljeno izbrisati lastnih tem (nastavite na 0, da onemogočite)",
+ "restrictions.min-title-length": "Najmanjša dolžina naslova",
+ "restrictions.max-title-length": "Največja dolžina naslova",
+ "restrictions.min-post-length": "Najmanjša dolžina objave",
+ "restrictions.max-post-length": "Največja dolžina objave",
+ "restrictions.days-until-stale": "Število dni, dokler se tema ne šteje za zastarelo",
+ "restrictions.stale-help": "Če se tema šteje za \"zastarelo\", bo uporabnikom, ki poskušajo odgovoriti na to temo, prikazano opozorilo.",
+ "timestamp": "Časovni žig",
+ "timestamp.cut-off": "Mejni datum (v dneh)",
"timestamp.cut-off-help": "Dates & times will be shown in a relative manner (e.g. \"3 hours ago\" / \"5 days ago\"), and localised into various\n\t\t\t\t\tlanguages. After a certain point, this text can be switched to display the localised date itself\n\t\t\t\t\t(e.g. 5 Nov 2016 15:30).
(Default: 30, or one month). Set to 0 to always display dates, leave blank to always display relative times.",
"timestamp.necro-threshold": "Necro Threshold (in days)",
"timestamp.necro-threshold-help": "A message will be shown between posts if the time between them is longer than the necro threshold. (Default: 7, or one week). Set to 0 to disable.",
- "timestamp.topic-views-interval": "Increment topic views interval (in minutes)",
- "timestamp.topic-views-interval-help": "Topic views will only increment once every X minutes as defined by this setting.",
+ "timestamp.topic-views-interval": "Povečanje intervala ogledov teme (v minutah)",
+ "timestamp.topic-views-interval-help": "Ogledi tem se bodo povečali le enkrat na vsakih X minut, kot je določeno s to nastavitvijo.",
"teaser": "Teaser Post",
- "teaser.last-post": "Last – Show the latest post, including the original post, if no replies",
- "teaser.last-reply": "Last – Show the latest reply, or a \"No replies\" placeholder if no replies",
- "teaser.first": "First",
- "unread": "Unread Settings",
+ "teaser.last-post": "Zadnja – Prikaži najnovejšo objavo, vključno z izvirno, če ni odgovorov",
+ "teaser.last-reply": "Zadnja – Prikaži najnovejši odgovor ali \"Ni odgovorov\", če ni odgovorov",
+ "teaser.first": "Prvi",
+ "unread": "Neprebrane nastavitve",
"unread.cutoff": "Unread cutoff days",
- "unread.min-track-last": "Minimum posts in topic before tracking last read",
- "recent": "Recent Settings",
+ "unread.min-track-last": "Najmanjše število objav v temi pred sledenjem zadnjem branju",
+ "recent": "Nedavne nastavitve",
"recent.max-topics": "Maximum topics on /recent",
"recent.categoryFilter.disable": "Disable filtering of topics in ignored categories on the /recent page",
- "signature": "Signature Settings",
- "signature.disable": "Disable signatures",
- "signature.no-links": "Disable links in signatures",
- "signature.no-images": "Disable images in signatures",
- "signature.max-length": "Maximum Signature Length",
+ "signature": "Nastavitve podpisa",
+ "signature.disable": "Onemogoči podpise",
+ "signature.no-links": "Onemogoči povezave v podpisih",
+ "signature.no-images": "Onemogoči slike v podpisih",
+ "signature.max-length": "Največja dolžina podpisa",
"composer": "Composer Settings",
"composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.",
- "composer.show-help": "Show \"Help\" tab",
- "composer.enable-plugin-help": "Allow plugins to add content to the help tab",
- "composer.custom-help": "Custom Help Text",
- "ip-tracking": "IP Tracking",
- "ip-tracking.each-post": "Track IP Address for each post",
- "enable-post-history": "Enable Post History"
+ "composer.show-help": "Prikaži zavihek \"Pomoč\"",
+ "composer.enable-plugin-help": "Dovoli vtičnikom dodajanje vsebine na zavihek za pomoč",
+ "composer.custom-help": "Besedilo pomoči po meri",
+ "ip-tracking": "IP sledenje",
+ "ip-tracking.each-post": "Sledi IP naslov za vsako objavo",
+ "enable-post-history": "Omogoči zgodovino objav"
}
\ No newline at end of file
diff --git a/public/language/sl/admin/settings/reputation.json b/public/language/sl/admin/settings/reputation.json
index 7cfa636521..a943374890 100644
--- a/public/language/sl/admin/settings/reputation.json
+++ b/public/language/sl/admin/settings/reputation.json
@@ -1,22 +1,22 @@
{
- "reputation": "Reputation Settings",
- "disable": "Disable Reputation System",
- "disable-down-voting": "Disable Down Voting",
- "votes-are-public": "All Votes Are Public",
+ "reputation": "Nastavitve ugleda",
+ "disable": "Onemogoči sistem ugleda",
+ "disable-down-voting": "Onemogoči glasovanje proti",
+ "votes-are-public": "Vsi glasovi so javni",
"thresholds": "Activity Thresholds",
- "min-rep-downvote": "Minimum reputation to downvote posts",
- "downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
- "downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
- "min-rep-flag": "Minimum reputation to flag posts",
- "min-rep-website": "Minimum reputation to add \"Website\" to user profile",
- "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile",
- "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile",
- "min-rep-profile-picture": "Minimum reputation to add \"Profile Picture\" to user profile",
- "min-rep-cover-picture": "Minimum reputation to add \"Cover Picture\" to user profile",
+ "min-rep-downvote": "Najmanjši ugled za objavo glasov proti",
+ "downvotes-per-day": "Glasovi proti na dan (nastavljeno na 0 za neomejeno število glasov proti)",
+ "downvotes-per-user-per-day": "Glasovi proti na uporabnika na dan (nastavljeno na 0 za neomejeno število glasov proti)",
+ "min-rep-flag": "Najmanjši ugled za označevanje objav z zastavico",
+ "min-rep-website": "Najmanjši ugled za dodajanje \"Spletna stran\" v uporabniški profil",
+ "min-rep-aboutme": "Najmanjši ugled za dodajanje \"O meni\" v uporabniški profil",
+ "min-rep-signature": "Najmanjši ugled za dodajanje \"Podpis\" v uporabniški profil",
+ "min-rep-profile-picture": "Najmanjši ugled za dodajanje \"Profilna slika\" v uporabniški profil",
+ "min-rep-cover-picture": "Najmanjši ugled za dodajanje \"Naslovna slika\" v uporabniški profil",
"flags": "Flag Settings",
- "flags.limit-per-target": "Maximum number of times something can be flagged",
- "flags.limit-per-target-placeholder": "Default: 0",
- "flags.limit-per-target-help": "When a post or user is flagged multiple times, each additional flag is considered a "report" and added to the original flag. Set this option to a number other than zero to limit the number of reports an item can receive.",
+ "flags.limit-per-target": "Največkrat, ko je mogoče nekaj označiti z zastavico",
+ "flags.limit-per-target-placeholder": "Privzeto: 0",
+ "flags.limit-per-target-help": "Ko je objava ali uporabnik večkrat označen z zastavico, se vsaka dodatna zastavica šteje za & quot;poročilo" in dodana prvotni zastavici. To možnost nastavite na število, različno od nič, da omejite število poročil, ki jih element lahko prejme.",
"flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned"
}
\ No newline at end of file
diff --git a/public/language/sl/admin/settings/social.json b/public/language/sl/admin/settings/social.json
index 23aedfcfaa..f01d398aa1 100644
--- a/public/language/sl/admin/settings/social.json
+++ b/public/language/sl/admin/settings/social.json
@@ -1,5 +1,5 @@
{
- "post-sharing": "Post Sharing",
- "info-plugins-additional": "Plugins can add additional networks for sharing posts.",
- "save-success": "Successfully saved Post Sharing Networks!"
+ "post-sharing": "Deljenje objav",
+ "info-plugins-additional": "Vtičniki lahko dodajo dodatna omrežja za deljenje objav.",
+ "save-success": "Uspešno shranjena omrežja za deljenje objav!"
}
\ No newline at end of file
diff --git a/public/language/sl/admin/settings/sockets.json b/public/language/sl/admin/settings/sockets.json
index d04ee42fcf..a47145831d 100644
--- a/public/language/sl/admin/settings/sockets.json
+++ b/public/language/sl/admin/settings/sockets.json
@@ -1,6 +1,6 @@
{
- "reconnection": "Reconnection Settings",
- "max-attempts": "Max Reconnection Attempts",
- "default-placeholder": "Default: %1",
- "delay": "Reconnection Delay"
+ "reconnection": "Nastavitve vzpostavitve ponovne povezave",
+ "max-attempts": "Največ poskusov vzpostavitve ponovne povezave",
+ "default-placeholder": "Privzeto: %1",
+ "delay": "Zamuda pri vzpostavitvi ponovne povezave"
}
\ No newline at end of file
diff --git a/public/language/sl/admin/settings/sounds.json b/public/language/sl/admin/settings/sounds.json
index 95ccbde0f1..0b20dfc83f 100644
--- a/public/language/sl/admin/settings/sounds.json
+++ b/public/language/sl/admin/settings/sounds.json
@@ -1,9 +1,9 @@
{
- "notifications": "Notifications",
- "chat-messages": "Chat Messages",
- "play-sound": "Play",
- "incoming-message": "Incoming Message",
- "outgoing-message": "Outgoing Message",
- "upload-new-sound": "Upload New Sound",
- "saved": "Settings Saved"
+ "notifications": "Obvestila",
+ "chat-messages": "Sporočila klepeta",
+ "play-sound": "Predvajaj",
+ "incoming-message": "Dohodno sporočilo",
+ "outgoing-message": "Odhodno sporočilo",
+ "upload-new-sound": "Naloži nov zvok",
+ "saved": "Nastavitve so shranjene"
}
\ No newline at end of file
diff --git a/public/language/sl/admin/settings/tags.json b/public/language/sl/admin/settings/tags.json
index 080010f6f0..3134921790 100644
--- a/public/language/sl/admin/settings/tags.json
+++ b/public/language/sl/admin/settings/tags.json
@@ -1,12 +1,12 @@
{
- "tag": "Tag Settings",
- "link-to-manage": "Manage Tags",
+ "tag": "Nastavitve oznak",
+ "link-to-manage": "Upravljaj oznake",
"system-tags": "System Tags",
- "system-tags-help": "Only privileged users will be able to use these tags.",
- "min-per-topic": "Minimum Tags per Topic",
- "max-per-topic": "Maximum Tags per Topic",
- "min-length": "Minimum Tag Length",
- "max-length": "Maximum Tag Length",
- "related-topics": "Related Topics",
- "max-related-topics": "Maximum related topics to display (if supported by theme)"
+ "system-tags-help": "Ze oznake bodo lahko uporabljali le privilegirani uporabniki.",
+ "min-per-topic": "Najmanj oznak na temo",
+ "max-per-topic": "Največ oznak na temo",
+ "min-length": "Najmanjša dolžina oznake",
+ "max-length": "Največja dolžina oznake",
+ "related-topics": "Sorodne teme",
+ "max-related-topics": "Največ sorodnih tem za prikaz (če jih tema podpira)"
}
\ No newline at end of file
diff --git a/public/language/sl/admin/settings/uploads.json b/public/language/sl/admin/settings/uploads.json
index 449ed22522..f03378516f 100644
--- a/public/language/sl/admin/settings/uploads.json
+++ b/public/language/sl/admin/settings/uploads.json
@@ -1,7 +1,7 @@
{
- "posts": "Posts",
- "allow-files": "Allow users to upload regular files",
- "private": "Make uploaded files private",
+ "posts": "Objave",
+ "allow-files": "Dovoli uporabnikom nalaganje navadnih datotek",
+ "private": "Naložene datoteke označi kot zasebne",
"strip-exif-data": "Strip EXIF Data",
"private-extensions": "File extensions to make private",
"private-uploads-extensions-help": "Enter comma-separated list of file extensions to make private here (e.g. pdf,xls,doc). An empty list means all files are private.",
@@ -19,7 +19,7 @@
"reject-image-height-help": "Images taller than this value will be rejected.",
"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
"topic-thumb-size": "Topic Thumb Size",
- "allowed-file-extensions": "Allowed File Extensions",
+ "allowed-file-extensions": "Dovoljene pripone datoteke",
"allowed-file-extensions-help": "Enter comma-separated list of file extensions here (e.g. pdf,xls,doc). An empty list means all extensions are allowed.",
"upload-limit-threshold": "Rate limit user uploads to:",
"upload-limit-threshold-per-minute": "Per %1 Minute",
@@ -28,7 +28,7 @@
"allow-profile-image-uploads": "Allow users to upload profile images",
"convert-profile-image-png": "Convert profile image uploads to PNG",
"default-avatar": "Custom Default Avatar",
- "upload": "Upload",
+ "upload": "Naloži",
"profile-image-dimension": "Profile Image Dimension",
"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
"max-profile-image-size": "Maximum Profile Image File Size",
diff --git a/public/language/sl/admin/settings/user.json b/public/language/sl/admin/settings/user.json
index 48be13b75e..f0a2955907 100644
--- a/public/language/sl/admin/settings/user.json
+++ b/public/language/sl/admin/settings/user.json
@@ -1,62 +1,62 @@
{
- "authentication": "Authentication",
- "require-email-confirmation": "Require Email Confirmation",
- "email-confirm-interval": "User may not resend a confirmation email until",
+ "authentication": "Preverjanje pristnosti",
+ "require-email-confirmation": "Zahtevaj potrditev po e-pošti",
+ "email-confirm-interval": "Uporabnik morda ne bo mogel znova poslati potrditvenega e-poštnega sporočila, dokler",
"email-confirm-email2": "minutes have elapsed",
- "allow-login-with": "Allow login with",
- "allow-login-with.username-email": "Username or Email",
- "allow-login-with.username": "Username Only",
- "allow-login-with.email": "Email Only",
- "account-settings": "Account Settings",
+ "allow-login-with": "Dovoli prijavo z",
+ "allow-login-with.username-email": "Uporabniško ime ali e-poštni naslov",
+ "allow-login-with.username": "Samo uporabniško ime",
+ "allow-login-with.email": "Samo e-poštni naslov",
+ "account-settings": "Nastavitve računa",
"gdpr_enabled": "Enable GDPR consent collection",
"gdpr_enabled_help": "When enabled, all new registrants will be required to explicitly give consent for data collection and usage under the General Data Protection Regulation (GDPR). Note: Enabling GDPR does not force pre-existing users to provide consent. To do so, you will need to install the GDPR plugin.",
- "disable-username-changes": "Disable username changes",
- "disable-email-changes": "Disable email changes",
- "disable-password-changes": "Disable password changes",
- "allow-account-deletion": "Allow account deletion",
- "hide-fullname": "Hide fullname from users",
- "hide-email": "Hide email from users",
- "show-fullname-as-displayname": "Show user's full name as their display name if available",
- "themes": "Themes",
- "disable-user-skins": "Prevent users from choosing a custom skin",
- "account-protection": "Account Protection",
- "admin-relogin-duration": "Admin relogin duration (minutes)",
+ "disable-username-changes": "Onemogoči spreminjanje uporabniškega imena",
+ "disable-email-changes": "Onemogoči spreminjanje e-poštnega naslova",
+ "disable-password-changes": "Onemogoči spreminjanje gesla",
+ "allow-account-deletion": "Dovoli brisanje računa",
+ "hide-fullname": "Skrij polno ime pred uporabniki",
+ "hide-email": "Skrij e-poštni naslov pred uporabniki",
+ "show-fullname-as-displayname": "Prikaži uporabnikovo polno ime kot njegovo prikazno ime, če je na voljo",
+ "themes": "Teme",
+ "disable-user-skins": "Prepreči uporabnikom izbiro preobleke po meri",
+ "account-protection": "Zaščita računa",
+ "admin-relogin-duration": "Trajanje ponovne prijave skrbnika (v minutah)",
"admin-relogin-duration-help": "After a set amount of time accessing the admin section will require re-login, set to 0 to disable",
- "login-attempts": "Login attempts per hour",
+ "login-attempts": "Število poskusov prijave na uro",
"login-attempts-help": "If login attempts to a user's account exceeds this threshold, that account will be locked for a pre-configured amount of time",
- "lockout-duration": "Account Lockout Duration (minutes)",
- "login-days": "Days to remember user login sessions",
- "password-expiry-days": "Force password reset after a set number of days",
- "session-time": "Session Time",
- "session-time-days": "Days",
- "session-time-seconds": "Seconds",
+ "lockout-duration": "Trajanje zaklepanja računa (v minutah)",
+ "login-days": "Dnevi za zapomnitev sej za prijavo uporabnikov",
+ "password-expiry-days": "Vsilite ponastavitev gesla po nastavljenem številu dni",
+ "session-time": "Čas seje",
+ "session-time-days": "Dni",
+ "session-time-seconds": "Sekund",
"session-time-help": "These values are used to govern how long a user stays logged in when they check "Remember Me" on login. Note that only one of these values will be used. If there is no seconds value we fall back to days. If there is no days value we default to 14 days.",
- "online-cutoff": "Minutes after user is considered inactive",
+ "online-cutoff": "Minut po tem, ko je uporabnik neaktiven",
"online-cutoff-help": "If user performs no actions for this duration, they are considered inactive and they do not receive realtime updates.",
- "registration": "User Registration",
- "registration-type": "Registration Type",
- "registration-approval-type": "Registration Approval Type",
- "registration-type.normal": "Normal",
+ "registration": "Registracija uporabnika",
+ "registration-type": "Vrsta registracije",
+ "registration-approval-type": "Vrsta odobritve registracije",
+ "registration-type.normal": "Običajno",
"registration-type.admin-approval": "Admin Approval",
"registration-type.admin-approval-ip": "Admin Approval for IPs",
- "registration-type.invite-only": "Invite Only",
+ "registration-type.invite-only": "Samo povabilo",
"registration-type.admin-invite-only": "Admin Invite Only",
"registration-type.disabled": "No registration",
"registration-type.help": "Normal - Users can register from the /register page.
\nInvite Only - Users can invite others from the users page.
\nAdmin Invite Only - Only administrators can invite others from users and admin/manage/users pages.
\nNo registration - No user registration.
",
"registration-approval-type.help": "Normal - Users are registered immediately.
\nAdmin Approval - User registrations are placed in an approval queue for administrators.
\nAdmin Approval for IPs - Normal for new users, Admin Approval for IP addresses that already have an account.
",
"registration-queue-auto-approve-time": "Automatic Approval Time",
- "registration-queue-auto-approve-time-help": "Hours before user is approved automatically. 0 to disable.",
+ "registration-queue-auto-approve-time-help": "Ure do samodejne potrditve uporabnika. 0 da onemogočite.",
"registration-queue-show-average-time": "Show users average time it takes to approve a new user",
- "registration.max-invites": "Maximum Invitations per User",
- "max-invites": "Maximum Invitations per User",
+ "registration.max-invites": "Največje število povabil na uporabnika",
+ "max-invites": "Največje število povabil na uporabnika",
"max-invites-help": "0 for no restriction. Admins get infinite invitations
Only applicable for \"Invite Only\"",
"invite-expiration": "Invite expiration",
- "invite-expiration-help": "# of days invitations expire in.",
- "min-username-length": "Minimum Username Length",
- "max-username-length": "Maximum Username Length",
- "min-password-length": "Minimum Password Length",
- "min-password-strength": "Minimum Password Strength",
- "max-about-me-length": "Maximum About Me Length",
+ "invite-expiration-help": "Število dni, v katerih poteče povabilo.",
+ "min-username-length": "Najmanjša dolžina uporabniškega imena",
+ "max-username-length": "Največja dolžina uporabniškega imena",
+ "min-password-length": "Najmanjša dolžina gesla",
+ "min-password-strength": "Najmanjša moč gesla",
+ "max-about-me-length": "Največja dolžina O meni",
"terms-of-use": "Forum Terms of Use (Leave blank to disable)",
"user-search": "User Search",
"user-search-results-per-page": "Number of results to display",
@@ -69,16 +69,16 @@
"update-url-with-post-index": "Update url with post index while browsing topics",
"digest-freq": "Subscribe to Digest",
"digest-freq.off": "Off",
- "digest-freq.daily": "Daily",
- "digest-freq.weekly": "Weekly",
- "digest-freq.monthly": "Monthly",
+ "digest-freq.daily": "Dnevno",
+ "digest-freq.weekly": "Tedensko",
+ "digest-freq.monthly": "Mesečno",
"email-chat-notifs": "Send an email if a new chat message arrives and I am not online",
"email-post-notif": "Send an email when replies are made to topics I am subscribed to",
- "follow-created-topics": "Follow topics you create",
- "follow-replied-topics": "Follow topics that you reply to",
- "default-notification-settings": "Default notification settings",
+ "follow-created-topics": "Spremljanj teme, ki si jih ustvaril",
+ "follow-replied-topics": "Spremljanj teme, na katere si odgovoril",
+ "default-notification-settings": "Privzete nastavitve obveščanja",
"categoryWatchState": "Default category watch state",
- "categoryWatchState.watching": "Watching",
- "categoryWatchState.notwatching": "Not Watching",
- "categoryWatchState.ignoring": "Ignoring"
+ "categoryWatchState.watching": "Spremljano",
+ "categoryWatchState.notwatching": "Ni spremljano",
+ "categoryWatchState.ignoring": "Prezrto"
}
diff --git a/public/language/sl/ip-blacklist.json b/public/language/sl/ip-blacklist.json
index 588fbd62b6..c038769e2f 100644
--- a/public/language/sl/ip-blacklist.json
+++ b/public/language/sl/ip-blacklist.json
@@ -1,7 +1,7 @@
{
- "lead": "Configure your IP blacklist here.",
+ "lead": "Tu nastavite svoj črni seznam IP.",
"description": "Occasionally, a user account ban is not enough of a deterrant. Other times, restricting access to the forum to a specific IP or a range of IPs is the best way to protect a forum. In these scenarios, you can add troublesome IP addresses or entire CIDR blocks to this blacklist, and they will be prevented from logging in to or registering a new account.",
- "active-rules": "Active Rules",
+ "active-rules": "Aktivna pravila",
"validate": "Validate Blacklist",
"apply": "Apply Blacklist",
"hints": "Syntax Hints",
diff --git a/public/language/sl/post-queue.json b/public/language/sl/post-queue.json
index bfaa367870..648f761751 100644
--- a/public/language/sl/post-queue.json
+++ b/public/language/sl/post-queue.json
@@ -1,18 +1,18 @@
{
- "post-queue": "Post Queue",
+ "post-queue": "Čakalna vrsta objav",
"description": "There are no posts in the post queue.
To enable this feature, go to Settings → Post → Post Queue and enable Post Queue.",
- "user": "User",
- "category": "Category",
- "title": "Title",
- "content": "Content",
+ "user": "Uporabnik",
+ "category": "Kategorija",
+ "title": "Naslov",
+ "content": "Vsebina",
"posted": "Posted",
- "reply-to": "Reply to \"%1\"",
- "content-editable": "Click on content to edit",
- "category-editable": "Click on category to edit",
- "title-editable": "Click on title to edit",
- "reply": "Reply",
- "topic": "Topic",
- "accept": "Accept",
- "reject": "Reject"
+ "reply-to": "Odgovor na %1",
+ "content-editable": "Za urejanje kliknite na vsebino",
+ "category-editable": "Za urejanje kliknite na kategorijo",
+ "title-editable": "Za urejanje kliknite na naslov",
+ "reply": "Odgovori",
+ "topic": "Tema",
+ "accept": "Sprejmi",
+ "reject": "Zavrni"
}
\ No newline at end of file
diff --git a/public/language/sl/user.json b/public/language/sl/user.json
index 23dbb21939..707996621b 100644
--- a/public/language/sl/user.json
+++ b/public/language/sl/user.json
@@ -1,27 +1,27 @@
{
"banned": "Izločen",
"offline": "Odjavljeni",
- "deleted": "Deleted",
+ "deleted": "Izbrisano",
"username": "Uporabniško ime",
"joindate": "Datum pridružitve",
"postcount": "Število objav",
"email": "E-pošta",
"confirm_email": "Potrdi e-poštni naslov",
"account_info": "Podatki računa",
- "admin_actions_label": "Administrative Actions",
+ "admin_actions_label": "Skrbniška dejanja",
"ban_account": "Izločen račun",
"ban_account_confirm": "Ali želiš izločiti uporabnika?",
"unban_account": "Ponovno vključi račun",
"delete_account": "Izbriši račun",
- "delete_account_as_admin": "Delete Account",
- "delete_content": "Delete Account Content",
- "delete_all": "Delete Account and Content",
- "delete_account_confirm": "Are you sure you want to anonymize your posts and delete your account?
This action is irreversible and you will not be able to recover any of your data
Enter your password to confirm that you wish to destroy this account.",
- "delete_this_account_confirm": "Are you sure you want to delete this account while leaving its contents behind?
This action is irreversible, posts will be anonymized, and you will not be able to restore post associations with the deleted account
",
- "delete_account_content_confirm": "Are you sure you want to delete this account's content (posts/topics/uploads)?
This action is irreversible and you will not be able to recover any data
",
- "delete_all_confirm": "Are you sure you want to delete this account and all of its content (posts/topics/uploads)?
This action is irreversible and you will not be able to recover any data
",
+ "delete_account_as_admin": "Izbriši račun",
+ "delete_content": "Izbriši vsebino računa",
+ "delete_all": "Izbriši račun in vsebino",
+ "delete_account_confirm": "Ste prepričani, da želite anonimizirati vašo objavo in izbrisati vaš račun?
To dejanje je nepovratno in podatkov ne boste mogli obnoviti.
Vnesite svoje geslo za potrditev, da želite uničiti ta račun.",
+ "delete_this_account_confirm": "Ali ste prepričani, da želite izbrisati ta račun, pri tem pa pustiti vsebino za seboj?
To dejanje je nepovratno, objave bodo anonimizirane in povezav objav z izbrisanim računom ne boste mogli obnoviti.
",
+ "delete_account_content_confirm": "Ali ste prepričani, da želite izbrisati vsebino tega računa (objave/teme/nalaganja)?
To dejanje je nepovratno in podatkov ne boste mogli obnoviti
",
+ "delete_all_confirm": "Ali ste prepričani, da želite izbrisati ta račun in vso njegovo vsebino (objave/teme/nalaganja)?
To dejanje je nepovratno in podatkov ne boste mogli obnoviti
",
"account-deleted": "Račun je izbrisan",
- "account-content-deleted": "Account content deleted",
+ "account-content-deleted": "Vsebina računa je izbrisana",
"fullname": "Ime in priimek",
"website": "Spletna stran",
"location": "Lokacija",
@@ -33,23 +33,23 @@
"reputation": "Naziv",
"bookmarks": "Zaznamki",
"watched_categories": "Spremljane kategorije",
- "change_all": "Change All",
+ "change_all": "Spremeni vse",
"watched": "Spremljano",
- "ignored": "Ignored",
- "default-category-watch-state": "Default category watch state",
+ "ignored": "Prezrto",
+ "default-category-watch-state": "Privzeto stanje spremljanja kategorij",
"followers": "Spremljevalci",
"following": "Spremljano",
"blocks": "Blocks",
"block_toggle": "Toggle Block",
- "block_user": "Block User",
- "unblock_user": "Unblock User",
+ "block_user": "Blokiraj uporabnika",
+ "unblock_user": "Odblokiraj uporabnika",
"aboutme": "O meni",
"signature": "Podpis",
"birthday": "Rojstni datum",
"chat": "Klepet",
- "chat_with": "Continue chat with %1",
- "new_chat_with": "Start new chat with %1",
- "flag-profile": "Flag Profile",
+ "chat_with": "Nadaljuj klepet z %1",
+ "new_chat_with": "Prični nov klepet z %1",
+ "flag-profile": "Označi profil z zastavico",
"follow": "Spremljaj",
"unfollow": "Ne spremljaj",
"more": "Več",
@@ -57,7 +57,7 @@
"change_picture": "Spremeni sliko",
"change_username": "Spremeni uporabniško ime",
"change_email": "Spremeni e-poštni naslov",
- "email_same_as_password": "Please enter your current password to continue – you've entered your new email again",
+ "email_same_as_password": "Za nadaljevanje vnesite svoje trenutno geslo & ndash; ponovno ste vnesli svoj novi e-poštni naslov",
"edit": "Uredi",
"edit-profile": "Uredi profil",
"default_picture": "Privzeta ikona",
@@ -76,15 +76,15 @@
"username_taken_workaround": "Predlagano uporabniško ime je že zasedeno, zato smo ga rahlo spremenili. Sedaj vas poznamo kot %1",
"password_same_as_username": "Vaše geslo je enako kot vaše uporabniško ime, prosim izberite drugačno geslo.",
"password_same_as_email": "Vaše geslo je enako kot vaše e-poštni naslov, prosim izberite drugačno geslo.",
- "weak_password": "Weak password.",
+ "weak_password": "Šibko geslo.",
"upload_picture": "Naloži fotografijo",
"upload_a_picture": "Naloži fotografijo",
"remove_uploaded_picture": "Odstrani preneseno sliko ",
"upload_cover_picture": "Prenesi fotografijo naslovnice",
- "remove_cover_picture_confirm": "Are you sure you want to remove the cover picture?",
- "crop_picture": "Crop picture",
- "upload_cropped_picture": "Crop and upload",
- "avatar-background-colour": "Avatar background colour",
+ "remove_cover_picture_confirm": "Ste prepričani, da želite odstraniti naslovno sliko?",
+ "crop_picture": "Obreži sliko",
+ "upload_cropped_picture": "Obreži in naloži",
+ "avatar-background-colour": "Slika ozadja avatarja",
"settings": "Nastavitve",
"show_email": "Pokaži moj e-poštni naslov.",
"show_fullname": "Pokaži moj ime in priimek.",
@@ -98,49 +98,49 @@
"has_no_follower": "Uporabniku nihče ne sledi :(",
"follows_no_one": "Uporabnik nikomur ne sledi :(",
"has_no_posts": "Uporabnik še ni nič objavil.",
- "has_no_best_posts": "This user does not have any upvoted posts yet.",
+ "has_no_best_posts": "Ta uporabnik še nima nobenih objav z glasovi za.",
"has_no_topics": "Uporabnik še ni objavil nobene teme.",
"has_no_watched_topics": "Uporabnik še ne spremlja nobene teme.",
- "has_no_ignored_topics": "This user hasn't ignored any topics yet.",
+ "has_no_ignored_topics": "Ta uporabnik še nima nobenih prezrtih tem.",
"has_no_upvoted_posts": "Uporabnik še ni glasoval za nobeno objavo.",
"has_no_downvoted_posts": "Uporabnik še ni glasoval proti nobeni objavi.",
"has_no_voted_posts": "Uporabnik nima glasovanih objav",
- "has_no_blocks": "You have blocked no users.",
+ "has_no_blocks": "Nimate blokiranih uporabnikov.",
"email_hidden": "Skrit e-poštni naslov",
"hidden": "skrit",
"paginate_description": "Uporabi oštevilčenje strani namesto neskončnega drsenja",
"topics_per_page": "Število tem na stran",
"posts_per_page": "Število objav na stran",
- "max_items_per_page": "Maximum %1",
- "acp_language": "Admin Page Language",
- "notifications": "Notifications",
- "upvote-notif-freq": "Upvote Notification Frequency",
- "upvote-notif-freq.all": "All Upvotes",
- "upvote-notif-freq.first": "First Per Post",
- "upvote-notif-freq.everyTen": "Every Ten Upvotes",
+ "max_items_per_page": "Največ %1",
+ "acp_language": "Jezik skrbniških strani",
+ "notifications": "Obvestila",
+ "upvote-notif-freq": "Pogostost obveščanja o glasovih za",
+ "upvote-notif-freq.all": "Vsi glasovi za",
+ "upvote-notif-freq.first": "Prvi na objavo",
+ "upvote-notif-freq.everyTen": "Vsakih 10 glasov za",
"upvote-notif-freq.threshold": "On 1, 5, 10, 25, 50, 100, 150, 200...",
"upvote-notif-freq.logarithmic": "On 10, 100, 1000...",
- "upvote-notif-freq.disabled": "Disabled",
+ "upvote-notif-freq.disabled": "Onemogočeno",
"browsing": "Preglej nastavitve",
"open_links_in_new_tab": "Zunanje povezave odpri v novem zavihku",
"enable_topic_searching": "Omogoči iskanje znotraj teme",
"topic_search_help": "Če omogočite, bo iskanje prepisalo brskalnikove prevzete nastavitve in vam omogočilo iskanje skozi celotno temo.",
"update_url_with_post_index": "Update url with post index while browsing topics",
- "scroll_to_my_post": "After posting a reply, show the new post",
+ "scroll_to_my_post": "Po objavi odgovora prikaži novo objavo",
"follow_topics_you_reply_to": "Spremljanj teme, na katere si odgovoril",
"follow_topics_you_create": "Spremljanj teme, ki si jih ustvaril",
"grouptitle": "Naslov skupine",
- "group-order-help": "Select a group and use the arrows to order titles",
+ "group-order-help": "Izberi skupino in uporabi puščice za razvrstitev naslovov",
"no-group-title": "Skupina nima imena",
"select-skin": "Izberi preobleko",
"select-homepage": "Izberi domačo stran",
"homepage": "Domača stran",
- "homepage_description": "Select a page to use as the forum homepage or 'None' to use the default homepage.",
- "custom_route": "Custom Homepage Route",
+ "homepage_description": "Izberite stran, ki jo želite uporabiti kot domačo stran foruma, ali 'Brez', če želite uporabiti privzeto domačo stran.",
+ "custom_route": "Po do domače strani po meri",
"custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\" or \"category/2/general-discussion\")",
"sso.title": "Storitev enotne prijave ",
"sso.associated": "Povezan z",
- "sso.not-associated": "Click here to associate with",
+ "sso.not-associated": "Kliknite tu da povežete z",
"sso.dissociate": "Dissociate",
"sso.dissociate-confirm-title": "Confirm Dissociation",
"sso.dissociate-confirm": "Are you sure you wish to dissociate your account from %1?",
@@ -151,16 +151,16 @@
"info.banned-until": "Banned until %1",
"info.banned-expiry": "Expiry",
"info.banned-permanently": "Banned permanently",
- "info.banned-reason-label": "Reason",
- "info.banned-no-reason": "No reason given.",
- "info.username-history": "Username History",
- "info.email-history": "Email History",
+ "info.banned-reason-label": "Razlog",
+ "info.banned-no-reason": "Razlog ni podan.",
+ "info.username-history": "Zgodovina uporabniškega imena",
+ "info.email-history": "Zgodovina e-poštnega naslova",
"info.moderation-note": "Moderation Note",
"info.moderation-note.success": "Moderation note saved",
- "info.moderation-note.add": "Add note",
+ "info.moderation-note.add": "Dodaj opombo",
"sessions.description": "This page allows you to view any active sessions on this forum and revoke them if necessary. You can revoke your own session by logging out of your account.",
"consent.title": "Your Rights & Consent",
- "consent.lead": "This community forum collects and processes your personal information.",
+ "consent.lead": "Ta forum skupnosti zbira in obdeluje vaše osebne podatke.",
"consent.intro": "We use this information strictly to personalise your experience in this community, as well as to associate the posts you make to your user account. During the registration step you were asked to provide a username and email address, you can also optionally provide additional information to complete your user profile on this website.
We retain this information for the life of your user account, and you are able to withdraw consent at any time by deleting your account. At any time you may request a copy of your contribution to this website, via your Rights & Consent page.
If you have any questions or concerns, we encourage you to reach out to this forum's administrative team.",
"consent.email_intro": "Occasionally, we may send emails to your registered email address in order to provide updates and/or to notify you of new activity that is pertinent to you. You can customise the frequency of the community digest (including disabling it outright), as well as select which types of notifications to receive via email, via your user settings page.",
"consent.digest_frequency": "Unless explicitly changed in your user settings, this community delivers email digests every %1.",
@@ -170,17 +170,17 @@
"consent.give": "Give consent",
"consent.right_of_access": "You have the Right of Access",
"consent.right_of_access_description": "You have the right to access any data collected by this website upon request. You can retrieve a copy of this data by clicking the appropriate button below.",
- "consent.right_to_rectification": "You have the Right to Rectification",
+ "consent.right_to_rectification": "Imate pravico do popravka.",
"consent.right_to_rectification_description": "You have the right to change or update any inaccurate data provided to us. Your profile can be updated by editing your profile, and post content can always be edited. If this is not the case, please contact this site's administrative team.",
- "consent.right_to_erasure": "You have the Right to Erasure",
+ "consent.right_to_erasure": "Imate pravico do izbrisa.",
"consent.right_to_erasure_description": "At any time, you are able to revoke your consent to data collection and/or processing by deleting your account. Your individual profile can be deleted, although your posted content will remain. If you wish to delete both your account and your content, please contact the administrative team for this website.",
- "consent.right_to_data_portability": "You have the Right to Data Portability",
+ "consent.right_to_data_portability": "Imate pravico do prenosa podatkov",
"consent.right_to_data_portability_description": "You may request from us a machine-readable export of any collected data about you and your account. You can do so by clicking the appropriate button below.",
- "consent.export_profile": "Export Profile (.json)",
+ "consent.export_profile": "Izvozi profil (.json)",
"consent.export-profile-success": "Exporting profile, you will get a notification when it is complete.",
- "consent.export_uploads": "Export Uploaded Content (.zip)",
+ "consent.export_uploads": "Izvozi naloženo vsebino (.zip)",
"consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.",
- "consent.export_posts": "Export Posts (.csv)",
+ "consent.export_posts": "Izvozi objave (.csv)",
"consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.",
"emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.",
"emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.",
diff --git a/public/language/sr/admin/settings/email.json b/public/language/sr/admin/settings/email.json
index 4b69f6e351..9e68a88f6f 100644
--- a/public/language/sr/admin/settings/email.json
+++ b/public/language/sr/admin/settings/email.json
@@ -37,6 +37,8 @@
"subscriptions.hour": "Digest Hour",
"subscriptions.hour-help": "Molim unesite broj koji označava satnicu kada da pošalje zakazani sažeti email (nrp. 0 za ponoć, 17 za 5:00 pm). Uzmite u obzir da će se slanje događati po satnici samog servara, i da vrlo verovatno se ne poklapa sa satnicom vašeg sistema.
Trenutno vreme servera je:
Sledeći dnevni sažeti email zakazan je za slanje u ",
"notifications.remove-images": "Remove images from email notifications",
+ "require-email-address": "Require new users to specify an email address",
+ "require-email-address-warning": "By default, users can opt-out of entering an email address. Enabling this option means they have to enter an email address in order to proceed with registration. It does not ensure user will enter a real email address, nor even an address they own.",
"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws."
}
\ No newline at end of file
diff --git a/public/language/sv/admin/settings/email.json b/public/language/sv/admin/settings/email.json
index 206cd068d8..4aa2ff5daa 100644
--- a/public/language/sv/admin/settings/email.json
+++ b/public/language/sv/admin/settings/email.json
@@ -37,6 +37,8 @@
"subscriptions.hour": "Digest Hour",
"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
"notifications.remove-images": "Remove images from email notifications",
+ "require-email-address": "Require new users to specify an email address",
+ "require-email-address-warning": "By default, users can opt-out of entering an email address. Enabling this option means they have to enter an email address in order to proceed with registration. It does not ensure user will enter a real email address, nor even an address they own.",
"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws."
}
\ No newline at end of file
diff --git a/public/language/th/admin/settings/email.json b/public/language/th/admin/settings/email.json
index 9bdbde26a6..af4e100eb6 100644
--- a/public/language/th/admin/settings/email.json
+++ b/public/language/th/admin/settings/email.json
@@ -37,6 +37,8 @@
"subscriptions.hour": "Digest Hour",
"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
"notifications.remove-images": "Remove images from email notifications",
+ "require-email-address": "Require new users to specify an email address",
+ "require-email-address-warning": "By default, users can opt-out of entering an email address. Enabling this option means they have to enter an email address in order to proceed with registration. It does not ensure user will enter a real email address, nor even an address they own.",
"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws."
}
\ No newline at end of file
diff --git a/public/language/tr/admin/settings/email.json b/public/language/tr/admin/settings/email.json
index 073c41320e..69a18e522a 100644
--- a/public/language/tr/admin/settings/email.json
+++ b/public/language/tr/admin/settings/email.json
@@ -37,6 +37,8 @@
"subscriptions.hour": "Digest Hour",
"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
"notifications.remove-images": "Görselleri e-posta bildirimlerinden kaldır",
+ "require-email-address": "Require new users to specify an email address",
+ "require-email-address-warning": "By default, users can opt-out of entering an email address. Enabling this option means they have to enter an email address in order to proceed with registration. It does not ensure user will enter a real email address, nor even an address they own.",
"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws."
}
\ No newline at end of file
diff --git a/public/language/uk/admin/settings/email.json b/public/language/uk/admin/settings/email.json
index 2f453ca312..306cd06969 100644
--- a/public/language/uk/admin/settings/email.json
+++ b/public/language/uk/admin/settings/email.json
@@ -37,6 +37,8 @@
"subscriptions.hour": "Година дайджесту",
"subscriptions.hour-help": "Вкажіть, будь ласка, годину о котрій кожного дня буде надсилатися дайджест (наприклад 0 — це північ, а 17 — п'ята година вечора). Зверніть увагу, що година визначається згідно налаштувань сервера і може не співпадати з часом вашого комп'ютера.
Приблизний час сервера:
Наступний дайджест заплановано до відправки ",
"notifications.remove-images": "Remove images from email notifications",
+ "require-email-address": "Require new users to specify an email address",
+ "require-email-address-warning": "By default, users can opt-out of entering an email address. Enabling this option means they have to enter an email address in order to proceed with registration. It does not ensure user will enter a real email address, nor even an address they own.",
"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws."
}
\ No newline at end of file
diff --git a/public/language/vi/admin/settings/email.json b/public/language/vi/admin/settings/email.json
index ef49bcc0ca..cfabb2a7f9 100644
--- a/public/language/vi/admin/settings/email.json
+++ b/public/language/vi/admin/settings/email.json
@@ -37,6 +37,8 @@
"subscriptions.hour": "Giờ Thông Báo",
"subscriptions.hour-help": "Vui lòng nhập một số đại diện cho giờ để gửi thông báo email đã lên lịch (VD: 0 cho nửa đêm, 17 cho 5h chiều). Hãy nhớ rằng đây là giờ theo chính máy chủ và có thể không khớp chính xác với đồng hồ hệ thống của bạn.
Thời gian máy chủ gần đúng là:
Thông báo hàng ngày kế tiếp được lên lịch để gửi ",
"notifications.remove-images": "Xóa hình ảnh khỏi thông báo email",
+ "require-email-address": "Bắt buộc người dùng mới phải điền địa chỉ email",
+ "require-email-address-warning": "Mặc định, người dùng có thể chọn không nhập địa chỉ email. Bật tùy chọn này nghĩa là họ buộc phải nhập địa chỉ email để đăng ký. Việc này không chắc người dùng sẽ nhập địa chỉ email thực, hoặc không phải địa chỉ mà họ sở hữu.",
"include-unverified-emails": "Gửi email đến những người nhận chưa xác nhận rõ ràng email của họ",
"include-unverified-warning": "Theo mặc định, người dùng có email được liên kết với tài khoản của họ đã được xác minh, nhưng có những trường hợp không phải như vậy (ví dụ: đăng nhập SSO, người dùng phổ thông, v.v.). Bạn tự chịu rủi ro khi bật cài đặt này – gửi email đến các địa chỉ chưa được xác minh có thể vi phạm luật chống thư rác trong khu vực."
}
\ No newline at end of file
diff --git a/public/language/zh-CN/admin/settings/email.json b/public/language/zh-CN/admin/settings/email.json
index ba294937fa..c1a6816fff 100644
--- a/public/language/zh-CN/admin/settings/email.json
+++ b/public/language/zh-CN/admin/settings/email.json
@@ -37,6 +37,8 @@
"subscriptions.hour": "摘要小时",
"subscriptions.hour-help": "请输入一个代表小时的数字来发送计划的电子邮件摘要 (例如，对于午夜，0，对于下午5:00，17)。 请记住，这是根据服务器本身的时间，可能与您的系统时钟不完全匹配。
服务器的大致时间为：
下一个每日摘要被计划在发送",
"notifications.remove-images": "Remove images from email notifications",
+ "require-email-address": "Require new users to specify an email address",
+ "require-email-address-warning": "By default, users can opt-out of entering an email address. Enabling this option means they have to enter an email address in order to proceed with registration. It does not ensure user will enter a real email address, nor even an address they own.",
"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws."
}
\ No newline at end of file
diff --git a/public/language/zh-TW/admin/settings/email.json b/public/language/zh-TW/admin/settings/email.json
index 0939908f2e..bda1858459 100644
--- a/public/language/zh-TW/admin/settings/email.json
+++ b/public/language/zh-TW/admin/settings/email.json
@@ -37,6 +37,8 @@
"subscriptions.hour": "摘要小時",
"subscriptions.hour-help": "請輸入一個代表小時的數字來發送排程的電子郵件摘要 (例如，對於午夜，0，對於下午5:00，17)。 請記住，這是根據伺服器本身的時間，可能與您的系統時鐘不完全符合。
伺服器的大致時間為：
下一個每日摘要被排程在發送",
"notifications.remove-images": "Remove images from email notifications",
+ "require-email-address": "Require new users to specify an email address",
+ "require-email-address-warning": "By default, users can opt-out of entering an email address. Enabling this option means they have to enter an email address in order to proceed with registration. It does not ensure user will enter a real email address, nor even an address they own.",
"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws."
}
\ No newline at end of file
diff --git a/public/less/admin/header.less b/public/less/admin/header.less
index 969a9d7ca5..709dbc378f 100644
--- a/public/less/admin/header.less
+++ b/public/less/admin/header.less
@@ -98,10 +98,12 @@
> li {
float: left;
margin-right: 30px;
+ padding-bottom: 10px;
+ border-bottom: 4px solid transparent;
+ transition: border-color 150ms linear;
&.active {
- border-bottom: 4px solid @brand-primary;
- padding-bottom: 10px;
+ border-color: @brand-primary;
}
> a {
diff --git a/public/src/admin/manage/privileges.js b/public/src/admin/manage/privileges.js
index e45f967475..afb9c45a6b 100644
--- a/public/src/admin/manage/privileges.js
+++ b/public/src/admin/manage/privileges.js
@@ -183,7 +183,8 @@ define('admin/manage/privileges', [
api.get(`/categories/${cid}/privileges`, {}).then((privileges) => {
ajaxify.data.privileges = { ...ajaxify.data.privileges, ...privileges };
const tpl = parseInt(cid, 10) ? 'admin/partials/privileges/category' : 'admin/partials/privileges/global';
- app.parseAndTranslate(tpl, { privileges }).then((html) => {
+ const isAdminPriv = ajaxify.currentPage.endsWith('admin/manage/privileges/admin');
+ app.parseAndTranslate(tpl, { privileges, isAdminPriv }).then((html) => {
// Get currently selected filters
const btnIndices = $('.privilege-filters button.btn-warning').map((idx, el) => $(el).index()).get();
$('.privilege-table-container').html(html);
diff --git a/public/src/client/account/info.js b/public/src/client/account/info.js
index 6e57439bff..05631ffa4f 100644
--- a/public/src/client/account/info.js
+++ b/public/src/client/account/info.js
@@ -21,7 +21,7 @@ define('forum/account/info', ['forum/account/header', 'components', 'forum/accou
app.alertSuccess('[[user:info.moderation-note.success]]');
var timestamp = Date.now();
var data = [{
- note: note,
+ note: utils.escapeHTML(note),
user: app.user,
timestamp: timestamp,
timestampISO: utils.toISOString(timestamp),
diff --git a/public/src/client/category/tools.js b/public/src/client/category/tools.js
index 0a10cec5be..a46624536c 100644
--- a/public/src/client/category/tools.js
+++ b/public/src/client/category/tools.js
@@ -275,11 +275,7 @@ define('forum/category/tools', [
if (!ajaxify.data.topics || !ajaxify.data.template.category) {
return;
}
- var numPinned = ajaxify.data.topics.reduce(function (memo, topic) {
- memo = topic.pinned ? memo += 1 : memo;
- return memo;
- }, 0);
-
+ var numPinned = ajaxify.data.topics.filter(topic => topic.pinned).length;
if ((!app.user.isAdmin && !app.user.isMod) || numPinned < 2) {
return;
}
@@ -291,15 +287,12 @@ define('forum/category/tools', [
topicListEl.sortable({
handle: '[component="topic/pinned"]',
items: '[component="category/topic"].pinned',
- update: function () {
- var data = [];
-
- var pinnedTopics = topicListEl.find('[component="category/topic"].pinned');
- pinnedTopics.each(function (index, element) {
- data.push({ tid: $(element).attr('data-tid'), order: pinnedTopics.length - index - 1 });
- });
-
- socket.emit('topics.orderPinnedTopics', data, function (err) {
+ update: function (ev, ui) {
+ var baseIndex = parseInt(topicListEl.find('[component="category/topic"].pinned').first().attr('data-index'), 10);
+ socket.emit('topics.orderPinnedTopics', {
+ tid: ui.item.attr('data-tid'),
+ order: baseIndex + ui.item.index() - 1,
+ }, function (err) {
if (err) {
return app.alertError(err.message);
}
diff --git a/public/src/client/login.js b/public/src/client/login.js
index 0c59cdf2cc..204dd799e2 100644
--- a/public/src/client/login.js
+++ b/public/src/client/login.js
@@ -1,7 +1,7 @@
'use strict';
-define('forum/login', ['hooks', 'jquery-form'], function (hooks) {
+define('forum/login', ['hooks', 'translator', 'jquery-form'], function (hooks, translator) {
var Login = {
_capsState: false,
};
@@ -44,17 +44,22 @@ define('forum/login', ['hooks', 'jquery-form'], function (hooks) {
window.location.href = pathname + '?' + qs;
},
error: function (data) {
+ var message = data.responseText;
+ var errInfo = data.responseJSON;
if (data.status === 403 && data.responseText === 'Forbidden') {
window.location.href = config.relative_path + '/login?error=csrf-invalid';
- } else {
- errorEl.find('p').translateText(data.responseText);
- errorEl.show();
- submitEl.removeClass('disabled');
-
- // Select the entire password if that field has focus
- if ($('#password:focus').length) {
- $('#password').select();
- }
+ } else if (errInfo && errInfo.hasOwnProperty('banned_until')) {
+ message = errInfo.banned_until ?
+ translator.compile('error:user-banned-reason-until', (new Date(errInfo.banned_until).toLocaleString()), errInfo.reason) :
+ '[[error:user-banned-reason, ' + errInfo.reason + ']]';
+ }
+ errorEl.find('p').translateText(message);
+ errorEl.show();
+ submitEl.removeClass('disabled');
+
+ // Select the entire password if that field has focus
+ if ($('#password:focus').length) {
+ $('#password').select();
}
},
});
diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.js
index dfc9f6ce72..793153325c 100644
--- a/public/src/client/topic/postTools.js
+++ b/public/src/client/topic/postTools.js
@@ -399,7 +399,12 @@ define('forum/topic/postTools', [
postAction('purge', getData(button, 'data-pid'));
}
- function postAction(action, pid) {
+ async function postAction(action, pid) {
+ ({ action } = await hooks.fire(`static:post.${action}`, { action, pid }));
+ if (!action) {
+ return;
+ }
+
bootbox.confirm('[[topic:post_' + action + '_confirm]]', function (confirm) {
if (!confirm) {
return;
diff --git a/public/src/sockets.js b/public/src/sockets.js
index 24fe64e747..b3bc6795ee 100644
--- a/public/src/sockets.js
+++ b/public/src/sockets.js
@@ -212,15 +212,20 @@ socket = window.socket;
}
function onEventBanned(data) {
- var message = data.until ? '[[error:user-banned-reason-until, ' + utils.toISOString(data.until) + ', ' + data.reason + ']]' : '[[error:user-banned-reason, ' + data.reason + ']]';
-
- bootbox.alert({
- title: '[[error:user-banned]]',
- message: message,
- closeButton: false,
- callback: function () {
- window.location.href = config.relative_path + '/';
- },
+ require(['translator'], function (translator) {
+ var message = data.until ?
+ translator.compile('error:user-banned-reason-until', (new Date(data.until).toLocaleString()), data.reason) :
+ '[[error:user-banned-reason, ' + data.reason + ']]';
+ translator.translate(message, function (message) {
+ bootbox.alert({
+ title: '[[error:user-banned]]',
+ message: message,
+ closeButton: false,
+ callback: function () {
+ window.location.href = config.relative_path + '/';
+ },
+ });
+ });
});
}
diff --git a/src/api/categories.js b/src/api/categories.js
index 118dd0a258..3c2e6a96ec 100644
--- a/src/api/categories.js
+++ b/src/api/categories.js
@@ -71,16 +71,19 @@ categoriesAPI.setPrivilege = async (caller, data) => {
throw new Error('[[error:invalid-data]]');
}
if (parseInt(data.cid, 10) === 0) {
- const adminPrivs = privs.filter(priv => privileges.admin.privilegeList.includes(priv));
- const globalPrivs = privs.filter(priv => privileges.global.privilegeList.includes(priv));
+ const adminPrivList = await privileges.admin.getPrivilegeList();
+ const adminPrivs = privs.filter(priv => adminPrivList.includes(priv));
if (adminPrivs.length) {
await privileges.admin[type](adminPrivs, data.member);
}
+ const globalPrivList = await privileges.global.getPrivilegeList();
+ const globalPrivs = privs.filter(priv => globalPrivList.includes(priv));
if (globalPrivs.length) {
await privileges.global[type](globalPrivs, data.member);
}
} else {
- const categoryPrivs = privs.filter(priv => privileges.categories.privilegeList.includes(priv));
+ const categoryPrivList = await privileges.categories.getPrivilegeList();
+ const categoryPrivs = privs.filter(priv => categoryPrivList.includes(priv));
await privileges.categories[type](categoryPrivs, data.cid, data.member);
}
diff --git a/src/batch.js b/src/batch.js
index dbce61f432..8442def721 100644
--- a/src/batch.js
+++ b/src/batch.js
@@ -33,7 +33,7 @@ exports.processSortedSet = async function (setKey, process, options) {
options.doneIf = typeof options.doneIf === 'function' ? options.doneIf : function () {};
let start = 0;
- let stop = options.batch;
+ let stop = options.batch - 1;
if (process && process.constructor && process.constructor.name !== 'AsyncFunction') {
process = util.promisify(process);
@@ -47,8 +47,8 @@ exports.processSortedSet = async function (setKey, process, options) {
}
await process(ids);
- start += utils.isNumber(options.alwaysStartAt) ? options.alwaysStartAt : options.batch + 1;
- stop = start + options.batch;
+ start += utils.isNumber(options.alwaysStartAt) ? options.alwaysStartAt : options.batch;
+ stop = start + options.batch - 1;
if (options.interval) {
await sleep(options.interval);
diff --git a/src/categories/create.js b/src/categories/create.js
index 7b787a666e..c72fce2bd4 100644
--- a/src/categories/create.js
+++ b/src/categories/create.js
@@ -203,9 +203,10 @@ module.exports = function (Categories) {
group = group || '';
let privsToCopy;
if (group) {
- privsToCopy = privileges.categories.groupPrivilegeList.slice(...filter);
+ const groupPrivilegeList = await privileges.categories.getGroupPrivilegeList();
+ privsToCopy = groupPrivilegeList.slice(...filter);
} else {
- const privs = privileges.categories.privilegeList.slice();
+ const privs = await privileges.categories.getPrivilegeList();
const halfIdx = privs.length / 2;
privsToCopy = privs.slice(0, halfIdx).slice(...filter).concat(privs.slice(halfIdx).slice(...filter));
}
diff --git a/src/categories/delete.js b/src/categories/delete.js
index dc3cba36a5..539ce20b19 100644
--- a/src/categories/delete.js
+++ b/src/categories/delete.js
@@ -48,7 +48,8 @@ module.exports = function (Categories) {
`cid:${cid}:tag:whitelist`,
`category:${cid}`,
]);
- await groups.destroy(privileges.categories.privilegeList.map(privilege => `cid:${cid}:privileges:${privilege}`));
+ const privilegeList = await privileges.categories.getPrivilegeList();
+ await groups.destroy(privilegeList.map(privilege => `cid:${cid}:privileges:${privilege}`));
}
async function removeFromParent(cid) {
diff --git a/src/controllers/admin/admins-mods.js b/src/controllers/admin/admins-mods.js
index 7aaf7558e6..be5c79d1d5 100644
--- a/src/controllers/admin/admins-mods.js
+++ b/src/controllers/admin/admins-mods.js
@@ -19,10 +19,11 @@ AdminsMods.get = async function (req, res, next) {
if (!selectedCategory) {
return next();
}
- const [admins, globalMods, moderators] = await Promise.all([
+ const [admins, globalMods, moderators, categoryPrivList] = await Promise.all([
groups.get('administrators', { uid: req.uid }),
groups.get('Global Moderators', { uid: req.uid }),
getModeratorsOfCategories(selectedCategory),
+ privileges.categories.getUserPrivilegeList(),
]);
res.render('admin/manage/admins-mods', {
@@ -30,7 +31,7 @@ AdminsMods.get = async function (req, res, next) {
globalMods: globalMods,
categoryMods: [moderators],
selectedCategory: selectedCategory,
- allPrivileges: privileges.categories.userPrivilegeList,
+ allPrivileges: categoryPrivList,
});
};
diff --git a/src/controllers/admin/privileges.js b/src/controllers/admin/privileges.js
index fbcd504a53..c3ab23b9d6 100644
--- a/src/controllers/admin/privileges.js
+++ b/src/controllers/admin/privileges.js
@@ -44,8 +44,9 @@ privilegesController.get = async function (req, res) {
res.render('admin/manage/privileges', {
privileges: privilegesData,
categories: categoriesData,
- selectedCategory: selectedCategory,
- cid: cid,
- group: group,
+ selectedCategory,
+ cid,
+ group,
+ isAdminPriv,
});
};
diff --git a/src/controllers/authentication.js b/src/controllers/authentication.js
index 4340b16508..d1a3173417 100644
--- a/src/controllers/authentication.js
+++ b/src/controllers/authentication.js
@@ -14,7 +14,6 @@ const user = require('../user');
const plugins = require('../plugins');
const utils = require('../utils');
const slugify = require('../slugify');
-const translator = require('../translator');
const helpers = require('./helpers');
const privileges = require('../privileges');
const sockets = require('../socket.io');
@@ -273,7 +272,7 @@ function continueLogin(strategy, req, res, next) {
passport.authenticate(strategy, async (err, userData, info) => {
if (err) {
plugins.hooks.fire('action:login.continue', { req, strategy, userData, error: err });
- return helpers.noScriptErrors(req, res, err.message, 403);
+ return helpers.noScriptErrors(req, res, err.data || err.message, 403);
}
if (!userData) {
@@ -433,8 +432,7 @@ authenticationController.localLogin = async function (req, username, password, n
userData.isAdminOrGlobalMod = isAdminOrGlobalMod;
if (!canLoginIfBanned) {
- const banMesage = await getBanInfo(uid);
- return next(new Error(banMesage));
+ return next(await getBanError(uid));
}
// Doing this after the ban check, because user's privileges might change after a ban expires
@@ -493,19 +491,19 @@ authenticationController.logout = async function (req, res, next) {
}
};
-async function getBanInfo(uid) {
+async function getBanError(uid) {
try {
const banInfo = await user.getLatestBanInfo(uid);
if (!banInfo.reason) {
- banInfo.reason = await translator.translate('[[user:info.banned-no-reason]]');
+ banInfo.reason = '[[user:info.banned-no-reason]]';
}
- return banInfo.banned_until ?
- `[[error:user-banned-reason-until, ${banInfo.banned_until_readable}, ${banInfo.reason}]]` :
- `[[error:user-banned-reason, ${banInfo.reason}]]`;
+ const err = new Error(banInfo.reason);
+ err.data = banInfo;
+ return err;
} catch (err) {
if (err.message === 'no-ban-info') {
- return '[[error:user-banned]]';
+ return new Error('[[error:user-banned]]');
}
throw err;
}
diff --git a/src/controllers/helpers.js b/src/controllers/helpers.js
index 9e54c27e71..6b91bba943 100644
--- a/src/controllers/helpers.js
+++ b/src/controllers/helpers.js
@@ -12,6 +12,7 @@ const privileges = require('../privileges');
const categories = require('../categories');
const plugins = require('../plugins');
const meta = require('../meta');
+const middlewareHelpers = require('../middleware/helpers');
const helpers = module.exports;
@@ -20,7 +21,10 @@ const url = nconf.get('url');
helpers.noScriptErrors = async function (req, res, error, httpStatus) {
if (req.body.noscript !== 'true') {
- return res.status(httpStatus).send(error);
+ if (typeof error === 'string') {
+ return res.status(httpStatus).send(error);
+ }
+ return res.status(httpStatus).json(error);
}
const middleware = require('../middleware');
const httpStatusString = httpStatus.toString();
@@ -121,7 +125,17 @@ helpers.notAllowed = async function (req, res, error) {
if (req.loggedIn || req.uid === -1) {
if (res.locals.isAPI) {
- helpers.formatApiResponse(403, res, error);
+ if (req.originalUrl.startsWith(`${relative_path}/api/v3`)) {
+ helpers.formatApiResponse(403, res, error);
+ } else {
+ res.status(403).json({
+ path: req.path.replace(/^\/api/, ''),
+ loggedIn: req.loggedIn,
+ error: error,
+ title: '[[global:403.title]]',
+ bodyClass: middlewareHelpers.buildBodyClass(req, res),
+ });
+ }
} else {
const middleware = require('../middleware');
await middleware.buildHeaderAsync(req, res);
diff --git a/src/database/mongo/connection.js b/src/database/mongo/connection.js
index 4986a5058c..c7c2b484e7 100644
--- a/src/database/mongo/connection.js
+++ b/src/database/mongo/connection.js
@@ -12,7 +12,7 @@ connection.getConnectionString = function (mongo) {
let usernamePassword = '';
const uri = mongo.uri || '';
if (mongo.username && mongo.password) {
- usernamePassword = `${nconf.get('mongo:username')}:${encodeURIComponent(nconf.get('mongo:password'))}@`;
+ usernamePassword = `${mongo.username}:${encodeURIComponent(mongo.password)}@`;
} else if (!uri.includes('@') || !uri.slice(uri.indexOf('://') + 3, uri.indexOf('@'))) {
winston.warn('You have no mongo username/password setup!');
}
diff --git a/src/database/mongo/list.js b/src/database/mongo/list.js
index 740d9ffd5e..e23b86bee4 100644
--- a/src/database/mongo/list.js
+++ b/src/database/mongo/list.js
@@ -54,9 +54,18 @@ module.exports = function (module) {
if (!key) {
return;
}
- value = helpers.valueToString(value);
+ const isArray = Array.isArray(value);
+ if (isArray) {
+ value = value.map(helpers.valueToString);
+ } else {
+ value = helpers.valueToString(value);
+ }
- await module.client.collection('objects').updateOne({ _key: key }, { $pull: { array: value } });
+ await module.client.collection('objects').updateOne({
+ _key: key,
+ }, {
+ $pull: { array: isArray ? { $in: value } : value },
+ });
};
module.listTrim = async function (key, start, stop) {
diff --git a/src/database/postgres/list.js b/src/database/postgres/list.js
index 1f771cb719..4fb4fc40f1 100644
--- a/src/database/postgres/list.js
+++ b/src/database/postgres/list.js
@@ -94,7 +94,11 @@ RETURNING A."array"[array_length(A."array", 1)] v`,
if (!key) {
return;
}
-
+ // TODO: remove all values with one query
+ if (Array.isArray(value)) {
+ await Promise.all(value.map(v => module.listRemoveAll(key, v)));
+ return;
+ }
await module.pool.query({
name: 'listRemoveAll',
text: `
diff --git a/src/database/redis/list.js b/src/database/redis/list.js
index bbd48ebddc..101ef178e3 100644
--- a/src/database/redis/list.js
+++ b/src/database/redis/list.js
@@ -1,6 +1,8 @@
'use strict';
module.exports = function (module) {
+ const helpers = require('./helpers');
+
module.listPrepend = async function (key, value) {
if (!key) {
return;
@@ -26,7 +28,13 @@ module.exports = function (module) {
if (!key) {
return;
}
- await module.client.lrem(key, 0, value);
+ if (Array.isArray(value)) {
+ const batch = module.client.batch();
+ value.forEach(value => batch.lrem(key, 0, value));
+ await helpers.execBatch(batch);
+ } else {
+ await module.client.lrem(key, 0, value);
+ }
};
module.listTrim = async function (key, start, stop) {
diff --git a/src/flags.js b/src/flags.js
index f3da5cb5f2..e071bf6fa9 100644
--- a/src/flags.js
+++ b/src/flags.js
@@ -794,7 +794,7 @@ async function mergeBanHistory(history, targetUid, uids) {
meta: [
{
key: '[[user:banned]]',
- value: cur.reason,
+ value: validator.escape(String(cur.reason)),
labelClass: 'danger',
},
{
diff --git a/src/meta/tags.js b/src/meta/tags.js
index 1f2c68e13f..4e5aeb6815 100644
--- a/src/meta/tags.js
+++ b/src/meta/tags.js
@@ -164,7 +164,7 @@ Tags.parse = async (req, data, meta, link) => {
return tag;
});
- addSiteOGImage(meta);
+ await addSiteOGImage(meta);
addIfNotExists(meta, 'property', 'og:title', Meta.config.title || 'NodeBB');
const ogUrl = url + (req.originalUrl !== '/' ? stripRelativePath(req.originalUrl) : '');
@@ -211,49 +211,59 @@ function stripRelativePath(url) {
return url;
}
-function addSiteOGImage(meta) {
+async function addSiteOGImage(meta) {
const key = Meta.config['og:image'] ? 'og:image' : 'brand:logo';
let ogImage = stripRelativePath(Meta.config[key] || '');
if (ogImage && !ogImage.startsWith('http')) {
ogImage = url + ogImage;
}
- if (ogImage) {
- meta.push({
- property: 'og:image',
- content: ogImage,
- noEscape: true,
- }, {
- property: 'og:image:url',
- content: ogImage,
- noEscape: true,
- });
+ const { images } = await plugins.hooks.fire('filter:meta.addSiteOGImage', {
+ images: [{
+ url: ogImage || `${url}/assets/images/logo@3x.png`,
+ width: ogImage ? Meta.config[`${key}:width`] : 963,
+ height: ogImage ? Meta.config[`${key}:height`] : 225,
+ }],
+ });
- if (Meta.config[`${key}:width`] && Meta.config[`${key}:height`]) {
- meta.push({
- property: 'og:image:width',
- content: String(Meta.config[`${key}:width`]),
- }, {
- property: 'og:image:height',
- content: String(Meta.config[`${key}:height`]),
- });
+ const properties = ['url', 'secure_url', 'type', 'width', 'height', 'alt'];
+ images.forEach((image) => {
+ for (const property of properties) {
+ if (image.hasOwnProperty(property)) {
+ switch (property) {
+ case 'url': {
+ meta.push({
+ property: 'og:image',
+ content: image.url,
+ noEscape: true,
+ }, {
+ property: 'og:image:url',
+ content: image.url,
+ noEscape: true,
+ });
+ break;
+ }
+
+ case 'secure_url': {
+ meta.push({
+ property: `og:${property}`,
+ content: image[property],
+ noEscape: true,
+ });
+ break;
+ }
+
+ case 'type':
+ case 'alt':
+ case 'width':
+ case 'height': {
+ meta.push({
+ property: `og:image:${property}`,
+ content: String(image[property]),
+ });
+ }
+ }
+ }
}
- } else {
- // Push fallback logo
- meta.push({
- property: 'og:image',
- content: `${url}/assets/images/logo@3x.png`,
- noEscape: true,
- }, {
- property: 'og:image:url',
- content: `${url}/assets/images/logo@3x.png`,
- noEscape: true,
- }, {
- property: 'og:image:width',
- content: '963',
- }, {
- property: 'og:image:height',
- content: '225',
- });
- }
+ });
}
diff --git a/src/plugins/hooks.js b/src/plugins/hooks.js
index 24875ca986..050da0a628 100644
--- a/src/plugins/hooks.js
+++ b/src/plugins/hooks.js
@@ -96,9 +96,11 @@ Hooks.fire = async function (hook, params) {
winston.warn(`[plugins] Unknown hookType: ${hookType}, hook : ${hook}`);
return;
}
+ let deleteCaller = false;
if (params && typeof params === 'object' && !params.hasOwnProperty('caller')) {
const als = require('../als');
params.caller = als.getStore();
+ deleteCaller = true;
}
const result = await hookTypeToMethod[hookType](hook, hookList, params);
@@ -107,6 +109,9 @@ Hooks.fire = async function (hook, params) {
Hooks.fire('action:plugins.firehook', payload);
}
if (result !== undefined) {
+ if (deleteCaller && result && result.caller) {
+ delete result.caller;
+ }
return result;
}
};
diff --git a/src/posts/edit.js b/src/posts/edit.js
index 93fd3090b9..d704996e1c 100644
--- a/src/posts/edit.js
+++ b/src/posts/edit.js
@@ -53,8 +53,8 @@ module.exports = function (Posts) {
]);
await Posts.setPostFields(data.pid, result.post);
-
- if (meta.config.enablePostHistory === 1) {
+ const contentChanged = data.content !== oldContent;
+ if (meta.config.enablePostHistory === 1 && contentChanged) {
await Posts.diffs.save({
pid: data.pid,
uid: data.uid,
@@ -72,7 +72,7 @@ module.exports = function (Posts) {
returnPostData.cid = topic.cid;
returnPostData.topic = topic;
returnPostData.editedISO = utils.toISOString(editPostData.edited);
- returnPostData.changed = oldContent !== data.content;
+ returnPostData.changed = contentChanged;
await topics.notifyFollowers(returnPostData, data.uid, {
type: 'post-edit',
diff --git a/src/privileges/admin.js b/src/privileges/admin.js
index d98e2c2bca..65e8cb2627 100644
--- a/src/privileges/admin.js
+++ b/src/privileges/admin.js
@@ -37,6 +37,16 @@ privsAdmin.groupPrivilegeList = privsAdmin.userPrivilegeList.map(privilege => `g
privsAdmin.privilegeList = privsAdmin.userPrivilegeList.concat(privsAdmin.groupPrivilegeList);
+privsAdmin.getUserPrivilegeList = async () => await plugins.hooks.fire('filter:privileges.admin.list', privsAdmin.userPrivilegeList.slice());
+privsAdmin.getGroupPrivilegeList = async () => await plugins.hooks.fire('filter:privileges.admin.groups.list', privsAdmin.groupPrivilegeList.slice());
+privsAdmin.getPrivilegeList = async () => {
+ const [user, group] = await Promise.all([
+ privsAdmin.getUserPrivilegeList(),
+ privsAdmin.getGroupPrivilegeList(),
+ ]);
+ return user.concat(group);
+};
+
// Mapping for a page route (via direct match or regexp) to a privilege
privsAdmin.routeMap = {
dashboard: 'admin:dashboard',
@@ -159,13 +169,14 @@ privsAdmin.list = async function (uid) {
};
privsAdmin.get = async function (uid) {
+ const userPrivilegeList = await privsAdmin.getUserPrivilegeList();
const [userPrivileges, isAdministrator] = await Promise.all([
- helpers.isAllowedTo(privsAdmin.userPrivilegeList, uid, 0),
+ helpers.isAllowedTo(userPrivilegeList, uid, 0),
user.isAdministrator(uid),
]);
const combined = userPrivileges.map(allowed => allowed || isAdministrator);
- const privData = _.zipObject(privsAdmin.userPrivilegeList, combined);
+ const privData = _.zipObject(userPrivilegeList, combined);
privData.superadmin = isAdministrator;
return await plugins.hooks.fire('filter:privileges.admin.get', privData);
@@ -200,9 +211,11 @@ privsAdmin.rescind = async function (privileges, groupName) {
};
privsAdmin.userPrivileges = async function (uid) {
- return await helpers.userOrGroupPrivileges(0, uid, privsAdmin.userPrivilegeList);
+ const userPrivilegeList = await privsAdmin.getUserPrivilegeList();
+ return await helpers.userOrGroupPrivileges(0, uid, userPrivilegeList);
};
privsAdmin.groupPrivileges = async function (groupName) {
- return await helpers.userOrGroupPrivileges(0, groupName, privsAdmin.groupPrivilegeList);
+ const groupPrivilegeList = await privsAdmin.getGroupPrivilegeList();
+ return await helpers.userOrGroupPrivileges(0, groupName, groupPrivilegeList);
};
diff --git a/src/privileges/categories.js b/src/privileges/categories.js
index 90fcffd2c3..f38291cb7b 100644
--- a/src/privileges/categories.js
+++ b/src/privileges/categories.js
@@ -54,6 +54,16 @@ privsCategories.groupPrivilegeList = privsCategories.userPrivilegeList.map(privi
privsCategories.privilegeList = privsCategories.userPrivilegeList.concat(privsCategories.groupPrivilegeList);
+privsCategories.getUserPrivilegeList = async () => await plugins.hooks.fire('filter:privileges.list', privsCategories.userPrivilegeList.slice());
+privsCategories.getGroupPrivilegeList = async () => await plugins.hooks.fire('filter:privileges.groups.list', privsCategories.groupPrivilegeList.slice());
+privsCategories.getPrivilegeList = async () => {
+ const [user, group] = await Promise.all([
+ privsCategories.getUserPrivilegeList(),
+ privsCategories.getGroupPrivilegeList(),
+ ]);
+ return user.concat(group);
+};
+
// Method used in admin/category controller to show all users/groups with privs in that given cid
privsCategories.list = async function (cid) {
const labels = await utils.promiseParallel({
@@ -210,9 +220,11 @@ privsCategories.canMoveAllTopics = async function (currentCid, targetCid, uid) {
};
privsCategories.userPrivileges = async function (cid, uid) {
- return await helpers.userOrGroupPrivileges(cid, uid, privsCategories.userPrivilegeList);
+ const userPrivilegeList = await privsCategories.getUserPrivilegeList();
+ return await helpers.userOrGroupPrivileges(cid, uid, userPrivilegeList);
};
privsCategories.groupPrivileges = async function (cid, groupName) {
- return await helpers.userOrGroupPrivileges(cid, groupName, privsCategories.groupPrivilegeList);
+ const groupPrivilegeList = await privsCategories.getGroupPrivilegeList();
+ return await helpers.userOrGroupPrivileges(cid, groupName, groupPrivilegeList);
};
diff --git a/src/privileges/global.js b/src/privileges/global.js
index 206e7769c3..c614d82f86 100644
--- a/src/privileges/global.js
+++ b/src/privileges/global.js
@@ -16,8 +16,8 @@ privsGlobal.privilegeLabels = [
{ name: '[[admin/manage/privileges:upload-images]]' },
{ name: '[[admin/manage/privileges:upload-files]]' },
{ name: '[[admin/manage/privileges:signature]]' },
- { name: '[[admin/manage/privileges:ban]]' },
{ name: '[[admin/manage/privileges:invite]]' },
+ { name: '[[admin/manage/privileges:allow-group-creation]]' },
{ name: '[[admin/manage/privileges:search-content]]' },
{ name: '[[admin/manage/privileges:search-users]]' },
{ name: '[[admin/manage/privileges:search-tags]]' },
@@ -25,7 +25,7 @@ privsGlobal.privilegeLabels = [
{ name: '[[admin/manage/privileges:view-tags]]' },
{ name: '[[admin/manage/privileges:view-groups]]' },
{ name: '[[admin/manage/privileges:allow-local-login]]' },
- { name: '[[admin/manage/privileges:allow-group-creation]]' },
+ { name: '[[admin/manage/privileges:ban]]' },
{ name: '[[admin/manage/privileges:view-users-info]]' },
];
@@ -34,8 +34,8 @@ privsGlobal.userPrivilegeList = [
'upload:post:image',
'upload:post:file',
'signature',
- 'ban',
'invite',
+ 'group:create',
'search:content',
'search:users',
'search:tags',
@@ -43,7 +43,7 @@ privsGlobal.userPrivilegeList = [
'view:tags',
'view:groups',
'local:login',
- 'group:create',
+ 'ban',
'view:users:info',
];
@@ -51,6 +51,16 @@ privsGlobal.groupPrivilegeList = privsGlobal.userPrivilegeList.map(privilege =>
privsGlobal.privilegeList = privsGlobal.userPrivilegeList.concat(privsGlobal.groupPrivilegeList);
+privsGlobal.getUserPrivilegeList = async () => await plugins.hooks.fire('filter:privileges.global.list', privsGlobal.userPrivilegeList.slice());
+privsGlobal.getGroupPrivilegeList = async () => await plugins.hooks.fire('filter:privileges.global.groups.list', privsGlobal.groupPrivilegeList.slice());
+privsGlobal.getPrivilegeList = async () => {
+ const [user, group] = await Promise.all([
+ privsGlobal.getUserPrivilegeList(),
+ privsGlobal.getGroupPrivilegeList(),
+ ]);
+ return user.concat(group);
+};
+
privsGlobal.list = async function () {
async function getLabels() {
return await utils.promiseParallel({
@@ -77,13 +87,14 @@ privsGlobal.list = async function () {
};
privsGlobal.get = async function (uid) {
+ const userPrivilegeList = await privsGlobal.getUserPrivilegeList();
const [userPrivileges, isAdministrator] = await Promise.all([
- helpers.isAllowedTo(privsGlobal.userPrivilegeList, uid, 0),
+ helpers.isAllowedTo(userPrivilegeList, uid, 0),
user.isAdministrator(uid),
]);
const combined = userPrivileges.map(allowed => allowed || isAdministrator);
- const privData = _.zipObject(privsGlobal.userPrivilegeList, combined);
+ const privData = _.zipObject(userPrivilegeList, combined);
return await plugins.hooks.fire('filter:privileges.global.get', privData);
};
@@ -122,9 +133,11 @@ privsGlobal.rescind = async function (privileges, groupName) {
};
privsGlobal.userPrivileges = async function (uid) {
- return await helpers.userOrGroupPrivileges(0, uid, privsGlobal.userPrivilegeList);
+ const userPrivilegeList = await privsGlobal.getUserPrivilegeList();
+ return await helpers.userOrGroupPrivileges(0, uid, userPrivilegeList);
};
privsGlobal.groupPrivileges = async function (groupName) {
- return await helpers.userOrGroupPrivileges(0, groupName, privsGlobal.groupPrivilegeList);
+ const groupPrivilegeList = await privsGlobal.getGroupPrivilegeList();
+ return await helpers.userOrGroupPrivileges(0, groupName, groupPrivilegeList);
};
diff --git a/src/privileges/topics.js b/src/privileges/topics.js
index 20ad19aa19..cabbf3dfed 100644
--- a/src/privileges/topics.js
+++ b/src/privileges/topics.js
@@ -38,6 +38,7 @@ privsTopics.get = async function (tid, uid) {
return await plugins.hooks.fire('filter:privileges.topics.get', {
'topics:reply': (privData['topics:reply'] && ((!topicData.locked && mayReply) || isModerator)) || isAdministrator,
'topics:read': privData['topics:read'] || isAdministrator,
+ 'topics:schedule': privData['topics:schedule'] || isAdministrator,
'topics:tag': privData['topics:tag'] || isAdministrator,
'topics:delete': (privData['topics:delete'] && (isOwner || isModerator)) || isAdministrator,
'posts:edit': (privData['posts:edit'] && (!topicData.locked || isModerator)) || isAdministrator,
diff --git a/src/routes/index.js b/src/routes/index.js
index 550eb94b2c..076c7c36b2 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -60,7 +60,12 @@ _mounts.topic = (app, name, middleware, controllers) => {
};
_mounts.post = (app, name, middleware, controllers) => {
- const middlewares = [middleware.maintenanceMode, middleware.registrationComplete, middleware.pluginHooks];
+ const middlewares = [
+ middleware.maintenanceMode,
+ middleware.authenticateRequest,
+ middleware.registrationComplete,
+ middleware.pluginHooks,
+ ];
app.get(`/${name}/:pid`, middleware.busyCheck, middlewares, controllers.posts.redirectToPost);
app.get(`/api/${name}/:pid`, middlewares, controllers.posts.redirectToPost);
};
diff --git a/src/socket.io/admin/email.js b/src/socket.io/admin/email.js
index c85b44778c..3177291778 100644
--- a/src/socket.io/admin/email.js
+++ b/src/socket.io/admin/email.js
@@ -14,7 +14,6 @@ Email.test = async function (socket, data) {
...(data.payload || {}),
subject: '[[email:test-email.subject]]',
};
- let template;
switch (data.template) {
case 'digest':
@@ -34,15 +33,11 @@ Email.test = async function (socket, data) {
break;
case 'verify-email':
- template = 'verify-email';
- // falls through
-
case 'welcome':
await userEmail.sendValidationEmail(socket.uid, {
force: 1,
- email: 'test@example.org',
- template: template || 'welcome',
- subject: !template ? `[[email:welcome-to, ${meta.config.title || meta.config.browserTitle || 'NodeBB'}]]` : undefined,
+ template: data.template,
+ subject: data.template === 'welcome' ? `[[email:welcome-to, ${meta.config.title || meta.config.browserTitle || 'NodeBB'}]]` : undefined,
});
break;
diff --git a/src/socket.io/topics/tools.js b/src/socket.io/topics/tools.js
index a4b6804576..e301cc33a3 100644
--- a/src/socket.io/topics/tools.js
+++ b/src/socket.io/topics/tools.js
@@ -68,7 +68,7 @@ module.exports = function (SocketTopics) {
};
SocketTopics.orderPinnedTopics = async function (socket, data) {
- if (!Array.isArray(data)) {
+ if (!data || !data.tid) {
throw new Error('[[error:invalid-data]]');
}
diff --git a/src/topics/create.js b/src/topics/create.js
index 666d203648..c9ac208ea9 100644
--- a/src/topics/create.js
+++ b/src/topics/create.js
@@ -76,7 +76,9 @@ module.exports = function (Topics) {
};
Topics.post = async function (data) {
+ data = await plugins.hooks.fire('filter:topic.post', data);
const { uid } = data;
+
data.title = String(data.title).trim();
data.tags = data.tags || [];
if (data.content) {
@@ -89,8 +91,8 @@ module.exports = function (Topics) {
const [categoryExists, canCreate, canTag] = await Promise.all([
categories.exists(data.cid),
- privileges.categories.can('topics:create', data.cid, data.uid),
- privileges.categories.can('topics:tag', data.cid, data.uid),
+ privileges.categories.can('topics:create', data.cid, uid),
+ privileges.categories.can('topics:tag', data.cid, uid),
]);
if (!categoryExists) {
@@ -103,10 +105,9 @@ module.exports = function (Topics) {
await guestHandleValid(data);
if (!data.fromQueue) {
- await user.isReadyToPost(data.uid, data.cid);
+ await user.isReadyToPost(uid, data.cid);
}
- const filteredData = await plugins.hooks.fire('filter:topic.post', data);
- data = filteredData;
+
const tid = await Topics.create(data);
let postData = data;
@@ -152,6 +153,7 @@ module.exports = function (Topics) {
};
Topics.reply = async function (data) {
+ data = await plugins.hooks.fire('filter:topic.reply', data);
const { tid } = data;
const { uid } = data;
@@ -165,7 +167,6 @@ module.exports = function (Topics) {
if (!data.fromQueue) {
await user.isReadyToPost(uid, data.cid);
}
- await plugins.hooks.fire('filter:topic.reply', data);
if (data.content) {
data.content = utils.rtrim(data.content);
}
diff --git a/src/topics/tools.js b/src/topics/tools.js
index e296b2d333..fa0d32aad9 100644
--- a/src/topics/tools.js
+++ b/src/topics/tools.js
@@ -8,6 +8,7 @@ const categories = require('../categories');
const user = require('../user');
const plugins = require('../plugins');
const privileges = require('../privileges');
+const utils = require('../utils');
module.exports = function (Topics) {
@@ -197,25 +198,34 @@ module.exports = function (Topics) {
}
topicTools.orderPinnedTopics = async function (uid, data) {
- const tids = data.map(topic => topic && topic.tid);
- const topicData = await Topics.getTopicsFields(tids, ['cid']);
+ const { tid, order } = data;
+ const cid = await Topics.getTopicField(tid, 'cid');
- const uniqueCids = _.uniq(topicData.map(topicData => topicData && topicData.cid));
- if (uniqueCids.length > 1 || !uniqueCids.length || !uniqueCids[0]) {
+ if (!cid || !tid || !utils.isNumber(order) || order < 0) {
throw new Error('[[error:invalid-data]]');
}
- const cid = uniqueCids[0];
-
const isAdminOrMod = await privileges.categories.isAdminOrMod(cid, uid);
if (!isAdminOrMod) {
throw new Error('[[error:no-privileges]]');
}
- const isPinned = await db.isSortedSetMembers(`cid:${cid}:tids:pinned`, tids);
- data = data.filter((topicData, index) => isPinned[index]);
- const bulk = data.map(topicData => [`cid:${cid}:tids:pinned`, topicData.order, topicData.tid]);
- await db.sortedSetAddBulk(bulk);
+ const pinnedTids = await db.getSortedSetRange(`cid:${cid}:tids:pinned`, 0, -1);
+ const currentIndex = pinnedTids.indexOf(String(tid));
+ if (currentIndex === -1) {
+ return;
+ }
+ const newOrder = pinnedTids.length - order - 1;
+ // moves tid to index order in the array
+ if (pinnedTids.length > 1) {
+ pinnedTids.splice(Math.max(0, newOrder), 0, pinnedTids.splice(currentIndex, 1)[0]);
+ }
+
+ await db.sortedSetAdd(
+ `cid:${cid}:tids:pinned`,
+ pinnedTids.map((tid, index) => index),
+ pinnedTids
+ );
};
topicTools.move = async function (tid, data) {
diff --git a/src/upgrades/1.0.0/global_moderators.js b/src/upgrades/1.0.0/global_moderators.js
index 2c7895996a..2152bdcfc7 100644
--- a/src/upgrades/1.0.0/global_moderators.js
+++ b/src/upgrades/1.0.0/global_moderators.js
@@ -1,32 +1,22 @@
'use strict';
-const async = require('async');
-
module.exports = {
name: 'Creating Global moderators group',
timestamp: Date.UTC(2016, 0, 23),
- method: function (callback) {
+ method: async function () {
const groups = require('../../groups');
- async.waterfall([
- function (next) {
- groups.exists('Global Moderators', next);
- },
- function (exists, next) {
- if (exists) {
- return next(null, null);
- }
- groups.create({
- name: 'Global Moderators',
- userTitle: 'Global Moderator',
- description: 'Forum wide moderators',
- hidden: 0,
- private: 1,
- disableJoinRequests: 1,
- }, next);
- },
- function (groupData, next) {
- groups.show('Global Moderators', next);
- },
- ], callback);
+ const exists = await groups.exists('Global Moderators');
+ if (exists) {
+ return;
+ }
+ await groups.create({
+ name: 'Global Moderators',
+ userTitle: 'Global Moderator',
+ description: 'Forum wide moderators',
+ hidden: 0,
+ private: 1,
+ disableJoinRequests: 1,
+ });
+ await groups.show('Global Moderators');
},
};
diff --git a/src/upgrades/1.0.0/theme_to_active_plugins.js b/src/upgrades/1.0.0/theme_to_active_plugins.js
index a541fde331..35f5b5865c 100644
--- a/src/upgrades/1.0.0/theme_to_active_plugins.js
+++ b/src/upgrades/1.0.0/theme_to_active_plugins.js
@@ -1,16 +1,13 @@
'use strict';
-const async = require('async');
const db = require('../../database');
module.exports = {
name: 'Adding theme to active plugins sorted set',
timestamp: Date.UTC(2015, 11, 23),
- method: function (callback) {
- async.waterfall([
- async.apply(db.getObjectField, 'config', 'theme:id'),
- async.apply(db.sortedSetAdd, 'plugins:active', 0),
- ], callback);
+ method: async function () {
+ const themeId = await db.getObjectField('config', 'theme:id');
+ await db.sortedSetAdd('plugins:active', 0, themeId);
},
};
diff --git a/src/upgrades/1.1.0/assign_topic_read_privilege.js b/src/upgrades/1.1.0/assign_topic_read_privilege.js
index 2b11904773..94c405cc83 100644
--- a/src/upgrades/1.1.0/assign_topic_read_privilege.js
+++ b/src/upgrades/1.1.0/assign_topic_read_privilege.js
@@ -1,71 +1,35 @@
-'use strict';
+/* eslint-disable no-await-in-loop */
+'use strict';
-const async = require('async');
const winston = require('winston');
const db = require('../../database');
module.exports = {
- name: 'Giving topics:read privs to any group that was previously allowed to Find & Access Category',
+ name: 'Giving topics:read privs to any group/user that was previously allowed to Find & Access Category',
timestamp: Date.UTC(2016, 4, 28),
- method: function (callback) {
+ method: async function () {
const groupsAPI = require('../../groups');
const privilegesAPI = require('../../privileges');
- db.getSortedSetRange('categories:cid', 0, -1, (err, cids) => {
- if (err) {
- return callback(err);
- }
-
- async.eachSeries(cids, (cid, next) => {
- privilegesAPI.categories.list(cid, (err, data) => {
- if (err) {
- return next(err);
- }
-
- const { groups } = data;
- const { users } = data;
-
- async.waterfall([
- function (next) {
- async.eachSeries(groups, (group, next) => {
- if (group.privileges['groups:read']) {
- return groupsAPI.join(`cid:${cid}:privileges:groups:topics:read`, group.name, (err) => {
- if (!err) {
- winston.verbose(`cid:${cid}:privileges:groups:topics:read granted to gid: ${group.name}`);
- }
+ const cids = await db.getSortedSetRange('categories:cid', 0, -1);
+ for (const cid of cids) {
+ const { groups, users } = await privilegesAPI.categories.list(cid);
- return next(err);
- });
- }
-
- next(null);
- }, next);
- },
- function (next) {
- async.eachSeries(users, (user, next) => {
- if (user.privileges.read) {
- return groupsAPI.join(`cid:${cid}:privileges:topics:read`, user.uid, (err) => {
- if (!err) {
- winston.verbose(`cid:${cid}:privileges:topics:read granted to uid: ${user.uid}`);
- }
-
- return next(err);
- });
- }
-
- next(null);
- }, next);
- },
- ], (err) => {
- if (!err) {
- winston.verbose(`-- cid ${cid} upgraded`);
- }
+ for (const group of groups) {
+ if (group.privileges['groups:read']) {
+ await groupsAPI.join(`cid:${cid}:privileges:groups:topics:read`, group.name);
+ winston.verbose(`cid:${cid}:privileges:groups:topics:read granted to gid: ${group.name}`);
+ }
+ }
- next(err);
- });
- });
- }, callback);
- });
+ for (const user of users) {
+ if (user.privileges.read) {
+ await groupsAPI.join(`cid:${cid}:privileges:topics:read`, user.uid);
+ winston.verbose(`cid:${cid}:privileges:topics:read granted to uid: ${user.uid}`);
+ }
+ }
+ winston.verbose(`-- cid ${cid} upgraded`);
+ }
},
};
diff --git a/src/upgrades/1.1.0/dismiss_flags_from_deleted_topics.js b/src/upgrades/1.1.0/dismiss_flags_from_deleted_topics.js
index b8f0325e31..0fa43b9090 100644
--- a/src/upgrades/1.1.0/dismiss_flags_from_deleted_topics.js
+++ b/src/upgrades/1.1.0/dismiss_flags_from_deleted_topics.js
@@ -1,101 +1,56 @@
'use strict';
-const async = require('async');
const winston = require('winston');
const db = require('../../database');
module.exports = {
name: 'Dismiss flags from deleted topics',
timestamp: Date.UTC(2016, 3, 29),
- method: function (callback) {
+ method: async function () {
const posts = require('../../posts');
const topics = require('../../topics');
- let pids;
- let tids;
+ const pids = await db.getSortedSetRange('posts:flagged', 0, -1);
+ const postData = await posts.getPostsFields(pids, ['tid']);
+ const tids = postData.map(t => t.tid);
+ const topicData = await topics.getTopicsFields(tids, ['deleted']);
+ const toDismiss = topicData.map((t, idx) => (parseInt(t.deleted, 10) === 1 ? pids[idx] : null)).filter(Boolean);
- async.waterfall([
- async.apply(db.getSortedSetRange, 'posts:flagged', 0, -1),
- function (_pids, next) {
- pids = _pids;
- posts.getPostsFields(pids, ['tid'], next);
- },
- function (_tids, next) {
- tids = _tids.map(a => a.tid);
-
- topics.getTopicsFields(tids, ['deleted'], next);
- },
- function (state, next) {
- const toDismiss = state.map((a, idx) => (parseInt(a.deleted, 10) === 1 ? pids[idx] : null)).filter(Boolean);
-
- winston.verbose(`[2016/04/29] ${toDismiss.length} dismissable flags found`);
- async.each(toDismiss, dismissFlag, next);
- },
- ], callback);
+ winston.verbose(`[2016/04/29] ${toDismiss.length} dismissable flags found`);
+ await Promise.all(toDismiss.map(dismissFlag));
},
};
// copied from core since this function was removed
// https://github.com/NodeBB/NodeBB/blob/v1.x.x/src/posts/flags.js
-function dismissFlag(pid, callback) {
- async.waterfall([
- function (next) {
- db.getObjectFields(`post:${pid}`, ['pid', 'uid', 'flags'], next);
- },
- function (postData, next) {
- if (!postData.pid) {
- return callback();
- }
- async.parallel([
- function (next) {
- if (parseInt(postData.uid, 10)) {
- if (parseInt(postData.flags, 10) > 0) {
- async.parallel([
- async.apply(db.sortedSetIncrBy, 'users:flags', -postData.flags, postData.uid),
- async.apply(db.incrObjectFieldBy, `user:${postData.uid}`, 'flags', -postData.flags),
- ], next);
- } else {
- next();
- }
- } else {
- next();
- }
- },
- function (next) {
- db.sortedSetsRemove([
- 'posts:flagged',
- 'posts:flags:count',
- `uid:${postData.uid}:flag:pids`,
- ], pid, next);
- },
- function (next) {
- async.series([
- function (next) {
- db.getSortedSetRange(`pid:${pid}:flag:uids`, 0, -1, (err, uids) => {
- if (err) {
- return next(err);
- }
-
- async.each(uids, (uid, next) => {
- const nid = `post_flag:${pid}:uid:${uid}`;
- async.parallel([
- async.apply(db.delete, `notifications:${nid}`),
- async.apply(db.sortedSetRemove, 'notifications', `post_flag:${pid}:uid:${uid}`),
- ], next);
- }, next);
- });
- },
- async.apply(db.delete, `pid:${pid}:flag:uids`),
- ], next);
- },
- async.apply(db.deleteObjectField, `post:${pid}`, 'flags'),
- async.apply(db.delete, `pid:${pid}:flag:uid:reason`),
- async.apply(db.deleteObjectFields, `post:${pid}`, ['flag:state', 'flag:assignee', 'flag:notes', 'flag:history']),
- ], next);
- },
- function (results, next) {
- db.sortedSetsRemoveRangeByScore(['users:flags'], '-inf', 0, next);
- },
- ], callback);
+async function dismissFlag(pid) {
+ const postData = await db.getObjectFields(`post:${pid}`, ['pid', 'uid', 'flags']);
+ if (!postData.pid) {
+ return;
+ }
+ if (parseInt(postData.uid, 10) && parseInt(postData.flags, 10) > 0) {
+ await Promise.all([
+ db.sortedSetIncrBy('users:flags', -postData.flags, postData.uid),
+ db.incrObjectFieldBy(`user:${postData.uid}`, 'flags', -postData.flags),
+ ]);
+ }
+ const uids = await db.getSortedSetRange(`pid:${pid}:flag:uids`, 0, -1);
+ const nids = uids.map(uid => `post_flag:${pid}:uid:${uid}`);
+
+ await Promise.all([
+ db.deleteAll(nids.map(nid => `notifications:${nid}`)),
+ db.sortedSetRemove('notifications', nids),
+ db.delete(`pid:${pid}:flag:uids`),
+ db.sortedSetsRemove([
+ 'posts:flagged',
+ 'posts:flags:count',
+ `uid:${postData.uid}:flag:pids`,
+ ], pid),
+ db.deleteObjectField(`post:${pid}`, 'flags'),
+ db.delete(`pid:${pid}:flag:uid:reason`),
+ db.deleteObjectFields(`post:${pid}`, ['flag:state', 'flag:assignee', 'flag:notes', 'flag:history']),
+ ]);
+
+ await db.sortedSetsRemoveRangeByScore(['users:flags'], '-inf', 0);
}
diff --git a/src/upgrades/1.10.0/search_privileges.js b/src/upgrades/1.10.0/search_privileges.js
index 0d53aa07b6..f5576e818b 100644
--- a/src/upgrades/1.10.0/search_privileges.js
+++ b/src/upgrades/1.10.0/search_privileges.js
@@ -1,30 +1,23 @@
'use strict';
-const async = require('async');
-
module.exports = {
name: 'Give global search privileges',
timestamp: Date.UTC(2018, 4, 28),
- method: function (callback) {
+ method: async function () {
const meta = require('../../meta');
const privileges = require('../../privileges');
const allowGuestSearching = parseInt(meta.config.allowGuestSearching, 10) === 1;
const allowGuestUserSearching = parseInt(meta.config.allowGuestUserSearching, 10) === 1;
- async.waterfall([
- function (next) {
- privileges.global.give(['groups:search:content', 'groups:search:users', 'groups:search:tags'], 'registered-users', next);
- },
- function (next) {
- const guestPrivs = [];
- if (allowGuestSearching) {
- guestPrivs.push('groups:search:content');
- }
- if (allowGuestUserSearching) {
- guestPrivs.push('groups:search:users');
- }
- guestPrivs.push('groups:search:tags');
- privileges.global.give(guestPrivs, 'guests', next);
- },
- ], callback);
+
+ await privileges.global.give(['groups:search:content', 'groups:search:users', 'groups:search:tags'], 'registered-users');
+ const guestPrivs = [];
+ if (allowGuestSearching) {
+ guestPrivs.push('groups:search:content');
+ }
+ if (allowGuestUserSearching) {
+ guestPrivs.push('groups:search:users');
+ }
+ guestPrivs.push('groups:search:tags');
+ await privileges.global.give(guestPrivs, 'guests');
},
};
diff --git a/src/upgrades/1.10.0/view_deleted_privilege.js b/src/upgrades/1.10.0/view_deleted_privilege.js
index ddf4b9c3fc..a483bcf417 100644
--- a/src/upgrades/1.10.0/view_deleted_privilege.js
+++ b/src/upgrades/1.10.0/view_deleted_privilege.js
@@ -1,7 +1,6 @@
-'use strict';
-
+/* eslint-disable no-await-in-loop */
-const async = require('async');
+'use strict';
const groups = require('../../groups');
const db = require('../../database');
@@ -9,19 +8,15 @@ const db = require('../../database');
module.exports = {
name: 'Give deleted post viewing privilege to moderators on all categories',
timestamp: Date.UTC(2018, 5, 8),
- method: function (callback) {
- db.getSortedSetRange('categories:cid', 0, -1, (err, cids) => {
- if (err) {
- return callback(err);
+ method: async function () {
+ const { progress } = this;
+ const cids = await db.getSortedSetRange('categories:cid', 0, -1);
+ for (const cid of cids) {
+ const uids = await db.getSortedSetRange(`group:cid:${cid}:privileges:moderate:members`, 0, -1);
+ for (const uid of uids) {
+ await groups.join(`cid:${cid}:privileges:posts:view_deleted`, uid);
}
- async.eachSeries(cids, (cid, next) => {
- async.waterfall([
- async.apply(db.getSortedSetRange.bind(db), `group:cid:${cid}:privileges:moderate:members`, 0, -1),
- function (uids, next) {
- async.eachSeries(uids, (uid, next) => groups.join(`cid:${cid}:privileges:posts:view_deleted`, uid, next), next);
- },
- ], next);
- }, callback);
- });
+ progress.incr();
+ }
},
};
diff --git a/src/upgrades/1.10.2/event_filters.js b/src/upgrades/1.10.2/event_filters.js
index d87a526d5e..cf2709a5ab 100644
--- a/src/upgrades/1.10.2/event_filters.js
+++ b/src/upgrades/1.10.2/event_filters.js
@@ -1,6 +1,7 @@
+/* eslint-disable no-await-in-loop */
+
'use strict';
-const async = require('async');
const db = require('../../database');
const batch = require('../../batch');
@@ -8,39 +9,29 @@ const batch = require('../../batch');
module.exports = {
name: 'add filters to events',
timestamp: Date.UTC(2018, 9, 4),
- method: function (callback) {
+ method: async function () {
const { progress } = this;
- batch.processSortedSet('events:time', (eids, next) => {
- async.eachSeries(eids, (eid, next) => {
+ await batch.processSortedSet('events:time', async (eids) => {
+ for (const eid of eids) {
progress.incr();
- db.getObject(`event:${eid}`, (err, eventData) => {
- if (err) {
- return next(err);
- }
- if (!eventData) {
- return db.sortedSetRemove('events:time', eid, next);
- }
- // privilege events we're missing type field
- if (!eventData.type && eventData.privilege) {
- eventData.type = 'privilege-change';
- async.waterfall([
- function (next) {
- db.setObjectField(`event:${eid}`, 'type', 'privilege-change', next);
- },
- function (next) {
- db.sortedSetAdd(`events:time:${eventData.type}`, eventData.timestamp, eid, next);
- },
- ], next);
- return;
- }
-
- db.sortedSetAdd(`events:time:${eventData.type || ''}`, eventData.timestamp, eid, next);
- });
- }, next);
+ const eventData = await db.getObject(`event:${eid}`);
+ if (!eventData) {
+ await db.sortedSetRemove('events:time', eid);
+ return;
+ }
+ // privilege events we're missing type field
+ if (!eventData.type && eventData.privilege) {
+ eventData.type = 'privilege-change';
+ await db.setObjectField(`event:${eid}`, 'type', 'privilege-change');
+ await db.sortedSetAdd(`events:time:${eventData.type}`, eventData.timestamp, eid);
+ return;
+ }
+ await db.sortedSetAdd(`events:time:${eventData.type || ''}`, eventData.timestamp, eid);
+ }
}, {
progress: this.progress,
- }, callback);
+ });
},
};
diff --git a/src/upgrades/1.10.2/fix_category_topic_zsets.js b/src/upgrades/1.10.2/fix_category_topic_zsets.js
index 692d35af18..999383feac 100644
--- a/src/upgrades/1.10.2/fix_category_topic_zsets.js
+++ b/src/upgrades/1.10.2/fix_category_topic_zsets.js
@@ -1,6 +1,7 @@
+/* eslint-disable no-await-in-loop */
+
'use strict';
-const async = require('async');
const db = require('../../database');
const batch = require('../../batch');
@@ -8,32 +9,22 @@ const batch = require('../../batch');
module.exports = {
name: 'Fix category topic zsets',
timestamp: Date.UTC(2018, 9, 11),
- method: function (callback) {
+ method: async function () {
const { progress } = this;
const topics = require('../../topics');
- batch.processSortedSet('topics:tid', (tids, next) => {
- async.eachSeries(tids, (tid, next) => {
+ await batch.processSortedSet('topics:tid', async (tids) => {
+ for (const tid of tids) {
progress.incr();
-
- async.waterfall([
- function (next) {
- db.getObjectFields(`topic:${tid}`, ['cid', 'pinned', 'postcount'], next);
- },
- function (topicData, next) {
- if (parseInt(topicData.pinned, 10) === 1) {
- return setImmediate(next);
- }
- topicData.postcount = parseInt(topicData.postcount, 10) || 0;
- db.sortedSetAdd(`cid:${topicData.cid}:tids:posts`, topicData.postcount, tid, next);
- },
- function (next) {
- topics.updateLastPostTimeFromLastPid(tid, next);
- },
- ], next);
- }, next);
+ const topicData = await db.getObjectFields(`topic:${tid}`, ['cid', 'pinned', 'postcount']);
+ if (parseInt(topicData.pinned, 10) !== 1) {
+ topicData.postcount = parseInt(topicData.postcount, 10) || 0;
+ await db.sortedSetAdd(`cid:${topicData.cid}:tids:posts`, topicData.postcount, tid);
+ }
+ await topics.updateLastPostTimeFromLastPid(tid);
+ }
}, {
progress: progress,
- }, callback);
+ });
},
};
diff --git a/src/upgrades/1.10.2/upgrade_bans_to_hashes.js b/src/upgrades/1.10.2/upgrade_bans_to_hashes.js
index 24a2cd8cc0..84c7a0ed4d 100644
--- a/src/upgrades/1.10.2/upgrade_bans_to_hashes.js
+++ b/src/upgrades/1.10.2/upgrade_bans_to_hashes.js
@@ -1,69 +1,39 @@
+/* eslint-disable no-await-in-loop */
+
'use strict';
-const async = require('async');
const db = require('../../database');
-
const batch = require('../../batch');
-// var user = require('../../user');
module.exports = {
name: 'Upgrade bans to hashes',
timestamp: Date.UTC(2018, 8, 24),
- method: function (callback) {
+ method: async function () {
const { progress } = this;
- batch.processSortedSet('users:joindate', (uids, next) => {
- async.eachSeries(uids, (uid, next) => {
+ await batch.processSortedSet('users:joindate', async (uids) => {
+ for (const uid of uids) {
progress.incr();
+ const [bans, reasons, userData] = await Promise.all([
+ db.getSortedSetRevRangeWithScores(`uid:${uid}:bans`, 0, -1),
+ db.getSortedSetRevRangeWithScores(`banned:${uid}:reasons`, 0, -1),
+ db.getObjectFields(`user:${uid}`, ['banned', 'banned:expire', 'joindate', 'lastposttime', 'lastonline']),
+ ]);
- async.parallel({
- bans: function (next) {
- db.getSortedSetRevRangeWithScores(`uid:${uid}:bans`, 0, -1, next);
- },
- reasons: function (next) {
- db.getSortedSetRevRangeWithScores(`banned:${uid}:reasons`, 0, -1, next);
- },
- userData: function (next) {
- db.getObjectFields(`user:${uid}`, ['banned', 'banned:expire', 'joindate', 'lastposttime', 'lastonline'], next);
- },
- }, (err, results) => {
- function addBan(key, data, callback) {
- async.waterfall([
- function (next) {
- db.setObject(key, data, next);
- },
- function (next) {
- db.sortedSetAdd(`uid:${uid}:bans:timestamp`, data.timestamp, key, next);
- },
- ], callback);
- }
- if (err) {
- return next(err);
- }
- // has no ban history and isn't banned, skip
- if (!results.bans.length && !parseInt(results.userData.banned, 10)) {
- return next();
- }
-
- // has no history, but is banned, create plain object with just uid and timestmap
- if (!results.bans.length && parseInt(results.userData.banned, 10)) {
- const banTimestamp = (
- results.userData.lastonline ||
- results.userData.lastposttime ||
- results.userData.joindate ||
- Date.now()
- );
- const banKey = `uid:${uid}:ban:${banTimestamp}`;
- addBan(banKey, { uid: uid, timestamp: banTimestamp }, next);
- return;
- }
-
+ // has no history, but is banned, create plain object with just uid and timestmap
+ if (!bans.length && parseInt(userData.banned, 10)) {
+ const banTimestamp = (
+ userData.lastonline ||
+ userData.lastposttime ||
+ userData.joindate ||
+ Date.now()
+ );
+ const banKey = `uid:${uid}:ban:${banTimestamp}`;
+ await addBan(uid, banKey, { uid: uid, timestamp: banTimestamp });
+ } else if (bans.length) {
// process ban history
- async.eachSeries(results.bans, (ban, next) => {
- function findReason(score) {
- return results.reasons.find(reasonData => reasonData.score === score);
- }
- const reasonData = findReason(ban.score);
+ for (const ban of bans) {
+ const reasonData = reasons.find(reasonData => reasonData.score === ban.score);
const banKey = `uid:${uid}:ban:${ban.score}`;
const data = {
uid: uid,
@@ -73,14 +43,17 @@ module.exports = {
if (reasonData) {
data.reason = reasonData.value;
}
- addBan(banKey, data, next);
- }, (err) => {
- next(err);
- });
- });
- }, next);
+ await addBan(uid, banKey, data);
+ }
+ }
+ }
}, {
progress: this.progress,
- }, callback);
+ });
},
};
+
+async function addBan(uid, key, data) {
+ await db.setObject(key, data);
+ await db.sortedSetAdd(`uid:${uid}:bans:timestamp`, data.timestamp, key);
+}
diff --git a/src/upgrades/1.10.2/username_email_history.js b/src/upgrades/1.10.2/username_email_history.js
index 69bae687d3..3b03568a69 100644
--- a/src/upgrades/1.10.2/username_email_history.js
+++ b/src/upgrades/1.10.2/username_email_history.js
@@ -1,6 +1,5 @@
'use strict';
-const async = require('async');
const db = require('../../database');
const batch = require('../../batch');
@@ -9,61 +8,30 @@ const user = require('../../user');
module.exports = {
name: 'Record first entry in username/email history',
timestamp: Date.UTC(2018, 7, 28),
- method: function (callback) {
+ method: async function () {
const { progress } = this;
- batch.processSortedSet('users:joindate', (ids, next) => {
- async.each(ids, (uid, next) => {
- async.parallel([
- function (next) {
- // Username
- async.waterfall([
- async.apply(db.sortedSetCard, `user:${uid}:usernames`),
- (count, next) => {
- if (count > 0) {
- // User has changed their username before, no record of original username, skip.
- return setImmediate(next, null, null);
- }
-
- user.getUserFields(uid, ['username', 'joindate'], next);
- },
- (userdata, next) => {
- if (!userdata || !userdata.joindate) {
- return setImmediate(next);
- }
-
- db.sortedSetAdd(`user:${uid}:usernames`, userdata.joindate, [userdata.username, userdata.joindate].join(':'), next);
- },
- ], next);
- },
- function (next) {
- // Email
- async.waterfall([
- async.apply(db.sortedSetCard, `user:${uid}:emails`),
- (count, next) => {
- if (count > 0) {
- // User has changed their email before, no record of original email, skip.
- return setImmediate(next, null, null);
- }
-
- user.getUserFields(uid, ['email', 'joindate'], next);
- },
- (userdata, next) => {
- if (!userdata || !userdata.joindate) {
- return setImmediate(next);
- }
-
- db.sortedSetAdd(`user:${uid}:emails`, userdata.joindate, [userdata.email, userdata.joindate].join(':'), next);
- },
- ], next);
- },
- ], (err) => {
- progress.incr();
- setImmediate(next, err);
- });
- }, next);
+ await batch.processSortedSet('users:joindate', async (uids) => {
+ async function updateHistory(uid, set, fieldName) {
+ const count = await db.sortedSetCard(set);
+ if (count <= 0) {
+ // User has not changed their username/email before, record original username
+ const userData = await user.getUserFields(uid, [fieldName, 'joindate']);
+ if (userData && userData.joindate && userData[fieldName]) {
+ await db.sortedSetAdd(set, userData.joindate, [userData[fieldName], userData.joindate].join(':'));
+ }
+ }
+ }
+
+ await Promise.all(uids.map(async (uid) => {
+ await Promise.all([
+ updateHistory(uid, `user:${uid}:usernames`, 'username'),
+ updateHistory(uid, `user:${uid}:emails`, 'email'),
+ ]);
+ progress.incr();
+ }));
}, {
progress: this.progress,
- }, callback);
+ });
},
};
diff --git a/src/upgrades/1.11.0/navigation_visibility_groups.js b/src/upgrades/1.11.0/navigation_visibility_groups.js
index 0a5e0b733d..3567b3c9c1 100644
--- a/src/upgrades/1.11.0/navigation_visibility_groups.js
+++ b/src/upgrades/1.11.0/navigation_visibility_groups.js
@@ -1,36 +1,28 @@
'use strict';
-const async = require('async');
-
module.exports = {
name: 'Navigation item visibility groups',
timestamp: Date.UTC(2018, 10, 10),
- method: function (callback) {
+ method: async function () {
const navigationAdmin = require('../../navigation/admin');
- async.waterfall([
- function (next) {
- navigationAdmin.get(next);
- },
- function (data, next) {
- data.forEach((navItem) => {
- if (navItem && navItem.properties) {
- navItem.groups = [];
- if (navItem.properties.adminOnly) {
- navItem.groups.push('administrators');
- } else if (navItem.properties.globalMod) {
- navItem.groups.push('Global Moderators');
- }
+ const data = await navigationAdmin.get();
+ data.forEach((navItem) => {
+ if (navItem && navItem.properties) {
+ navItem.groups = [];
+ if (navItem.properties.adminOnly) {
+ navItem.groups.push('administrators');
+ } else if (navItem.properties.globalMod) {
+ navItem.groups.push('Global Moderators');
+ }
- if (navItem.properties.loggedIn) {
- navItem.groups.push('registered-users');
- } else if (navItem.properties.guestOnly) {
- navItem.groups.push('guests');
- }
- }
- });
- navigationAdmin.save(data, next);
- },
- ], callback);
+ if (navItem.properties.loggedIn) {
+ navItem.groups.push('registered-users');
+ } else if (navItem.properties.guestOnly) {
+ navItem.groups.push('guests');
+ }
+ }
+ });
+ await navigationAdmin.save(data);
},
};
diff --git a/src/upgrades/1.11.0/resize_image_width.js b/src/upgrades/1.11.0/resize_image_width.js
index faab4bb843..a29a45f4f3 100644
--- a/src/upgrades/1.11.0/resize_image_width.js
+++ b/src/upgrades/1.11.0/resize_image_width.js
@@ -1,24 +1,14 @@
'use strict';
-const async = require('async');
const db = require('../../database');
-
module.exports = {
name: 'Rename maximumImageWidth to resizeImageWidth',
timestamp: Date.UTC(2018, 9, 24),
- method: function (callback) {
+ method: async function () {
const meta = require('../../meta');
- async.waterfall([
- function (next) {
- meta.configs.get('maximumImageWidth', next);
- },
- function (value, next) {
- meta.configs.set('resizeImageWidth', value, next);
- },
- function (next) {
- db.deleteObjectField('config', 'maximumImageWidth', next);
- },
- ], callback);
+ const value = await meta.configs.get('maximumImageWidth');
+ await meta.configs.set('resizeImageWidth', value);
+ await db.deleteObjectField('config', 'maximumImageWidth');
},
};
diff --git a/src/upgrades/1.11.0/widget_visibility_groups.js b/src/upgrades/1.11.0/widget_visibility_groups.js
index 41db65a086..66ceac8795 100644
--- a/src/upgrades/1.11.0/widget_visibility_groups.js
+++ b/src/upgrades/1.11.0/widget_visibility_groups.js
@@ -1,47 +1,38 @@
'use strict';
-const async = require('async');
-
module.exports = {
name: 'Widget visibility groups',
timestamp: Date.UTC(2018, 10, 10),
- method: function (callback) {
+ method: async function () {
const widgetAdmin = require('../../widgets/admin');
const widgets = require('../../widgets');
- async.waterfall([
- function (next) {
- widgetAdmin.getAreas(next);
- },
- function (areas, next) {
- async.eachSeries(areas, (area, next) => {
- if (area.data.length) {
- // area.data is actually an array of widgets
- area.widgets = area.data;
- area.widgets.forEach((widget) => {
- if (widget && widget.data) {
- const groupsToShow = ['administrators', 'Global Moderators'];
- if (widget.data['hide-guests'] !== 'on') {
- groupsToShow.push('guests');
- }
- if (widget.data['hide-registered'] !== 'on') {
- groupsToShow.push('registered-users');
- }
+ const areas = await widgetAdmin.getAreas();
+ for (const area of areas) {
+ if (area.data.length) {
+ // area.data is actually an array of widgets
+ area.widgets = area.data;
+ area.widgets.forEach((widget) => {
+ if (widget && widget.data) {
+ const groupsToShow = ['administrators', 'Global Moderators'];
+ if (widget.data['hide-guests'] !== 'on') {
+ groupsToShow.push('guests');
+ }
+ if (widget.data['hide-registered'] !== 'on') {
+ groupsToShow.push('registered-users');
+ }
- widget.data.groups = groupsToShow;
+ widget.data.groups = groupsToShow;
- // if we are showing to all 4 groups, set to empty array
- // empty groups is shown to everyone
- if (groupsToShow.length === 4) {
- widget.data.groups.length = 0;
- }
- }
- });
- widgets.setArea(area, next);
- } else {
- next();
+ // if we are showing to all 4 groups, set to empty array
+ // empty groups is shown to everyone
+ if (groupsToShow.length === 4) {
+ widget.data.groups.length = 0;
+ }
}
- }, next);
- },
- ], callback);
+ });
+ // eslint-disable-next-line no-await-in-loop
+ await widgets.setArea(area);
+ }
+ }
},
};
diff --git a/src/upgrades/1.12.0/category_watch_state.js b/src/upgrades/1.12.0/category_watch_state.js
index 71e430bedb..1363d50bc2 100644
--- a/src/upgrades/1.12.0/category_watch_state.js
+++ b/src/upgrades/1.12.0/category_watch_state.js
@@ -1,6 +1,6 @@
-'use strict';
+/* eslint-disable no-await-in-loop */
-const async = require('async');
+'use strict';
const db = require('../../database');
const batch = require('../../batch');
@@ -9,39 +9,27 @@ const categories = require('../../categories');
module.exports = {
name: 'Update category watch data',
timestamp: Date.UTC(2018, 11, 13),
- method: function (callback) {
+ method: async function () {
const { progress } = this;
- let keys;
- async.waterfall([
- function (next) {
- db.getSortedSetRange('categories:cid', 0, -1, next);
- },
- function (cids, next) {
- keys = cids.map(cid => `cid:${cid}:ignorers`);
- batch.processSortedSet('users:joindate', (uids, next) => {
- progress.incr(uids.length);
- async.eachSeries(cids, (cid, next) => {
- db.isSortedSetMembers(`cid:${cid}:ignorers`, uids, (err, isMembers) => {
- if (err) {
- return next(err);
- }
- uids = uids.filter((uid, index) => isMembers[index]);
- if (!uids.length) {
- return setImmediate(next);
- }
- const states = uids.map(() => categories.watchStates.ignoring);
- db.sortedSetAdd(`cid:${cid}:uid:watch:state`, states, uids, next);
- });
- }, next);
- }, {
- progress: progress,
- batch: 500,
- }, next);
- },
- function (next) {
- db.deleteAll(keys, next);
- },
- ], callback);
+ const cids = await db.getSortedSetRange('categories:cid', 0, -1);
+ const keys = cids.map(cid => `cid:${cid}:ignorers`);
+
+ await batch.processSortedSet('users:joindate', async (uids) => {
+ progress.incr(uids.length);
+ for (const cid of cids) {
+ const isMembers = await db.isSortedSetMembers(`cid:${cid}:ignorers`, uids);
+ uids = uids.filter((uid, index) => isMembers[index]);
+ if (uids.length) {
+ const states = uids.map(() => categories.watchStates.ignoring);
+ await db.sortedSetAdd(`cid:${cid}:uid:watch:state`, states, uids);
+ }
+ }
+ }, {
+ progress: progress,
+ batch: 500,
+ });
+
+ await db.deleteAll(keys);
},
};
diff --git a/src/upgrades/1.12.1/moderation_notes_refactor.js b/src/upgrades/1.12.1/moderation_notes_refactor.js
index 59ea6e6b38..390273d74a 100644
--- a/src/upgrades/1.12.1/moderation_notes_refactor.js
+++ b/src/upgrades/1.12.1/moderation_notes_refactor.js
@@ -1,55 +1,35 @@
+/* eslint-disable no-await-in-loop */
+
'use strict';
-const async = require('async');
const db = require('../../database');
const batch = require('../../batch');
-
module.exports = {
name: 'Update moderation notes to hashes',
timestamp: Date.UTC(2019, 3, 5),
- method: function (callback) {
+ method: async function () {
const { progress } = this;
- batch.processSortedSet('users:joindate', (ids, next) => {
- async.each(ids, (uid, next) => {
+ await batch.processSortedSet('users:joindate', async (uids) => {
+ await Promise.all(uids.map(async (uid) => {
progress.incr();
- db.getSortedSetRevRange(`uid:${uid}:moderation:notes`, 0, -1, (err, notes) => {
- if (err || !notes.length) {
- return next(err);
- }
- async.eachSeries(notes, (note, next) => {
- let noteData;
- async.waterfall([
- function (next) {
- try {
- noteData = JSON.parse(note);
- noteData.timestamp = noteData.timestamp || Date.now();
- setImmediate(next);
- } catch (err) {
- next(err);
- }
- },
- function (next) {
- db.sortedSetRemove(`uid:${uid}:moderation:notes`, note, next);
- },
- function (next) {
- db.setObject(`uid:${uid}:moderation:note:${noteData.timestamp}`, {
- uid: noteData.uid,
- timestamp: noteData.timestamp,
- note: noteData.note,
- }, next);
- },
- function (next) {
- db.sortedSetAdd(`uid:${uid}:moderation:notes`, noteData.timestamp, noteData.timestamp, next);
- },
- ], next);
- }, next);
- });
- }, next);
+ const notes = await db.getSortedSetRevRange(`uid:${uid}:moderation:notes`, 0, -1);
+ for (const note of notes) {
+ const noteData = JSON.parse(note);
+ noteData.timestamp = noteData.timestamp || Date.now();
+ await db.sortedSetRemove(`uid:${uid}:moderation:notes`, note);
+ await db.setObject(`uid:${uid}:moderation:note:${noteData.timestamp}`, {
+ uid: noteData.uid,
+ timestamp: noteData.timestamp,
+ note: noteData.note,
+ });
+ await db.sortedSetAdd(`uid:${uid}:moderation:notes`, noteData.timestamp, noteData.timestamp);
+ }
+ }));
}, {
progress: this.progress,
- }, callback);
+ });
},
};
diff --git a/src/upgrades/1.12.3/give_mod_info_privilege.js b/src/upgrades/1.12.3/give_mod_info_privilege.js
index c613bf6205..e8c51978bb 100644
--- a/src/upgrades/1.12.3/give_mod_info_privilege.js
+++ b/src/upgrades/1.12.3/give_mod_info_privilege.js
@@ -1,6 +1,7 @@
+/* eslint-disable no-await-in-loop */
+
'use strict';
-const async = require('async');
const db = require('../../database');
const privileges = require('../../privileges');
const groups = require('../../groups');
@@ -8,38 +9,19 @@ const groups = require('../../groups');
module.exports = {
name: 'give mod info privilege',
timestamp: Date.UTC(2019, 9, 8),
- method: function (callback) {
- async.waterfall([
- function (next) {
- db.getSortedSetRevRange('categories:cid', 0, -1, next);
- },
- function (cids, next) {
- async.eachSeries(cids, (cid, next) => {
- async.waterfall([
- function (next) {
- givePrivsToModerators(cid, '', next);
- },
- function (next) {
- givePrivsToModerators(cid, 'groups:', next);
- },
- ], next);
- }, next);
- },
- function (next) {
- privileges.global.give(['groups:view:users:info'], 'Global Moderators', next);
- },
- ], callback);
- function givePrivsToModerators(cid, groupPrefix, callback) {
- async.waterfall([
- function (next) {
- db.getSortedSetRevRange(`group:cid:${cid}:privileges:${groupPrefix}moderate:members`, 0, -1, next);
- },
- function (members, next) {
- async.eachSeries(members, (member, next) => {
- groups.join(['cid:0:privileges:view:users:info'], member, next);
- }, next);
- },
- ], callback);
+ method: async function () {
+ const cids = await db.getSortedSetRevRange('categories:cid', 0, -1);
+ for (const cid of cids) {
+ await givePrivsToModerators(cid, '');
+ await givePrivsToModerators(cid, 'groups:');
+ }
+ await privileges.global.give(['groups:view:users:info'], 'Global Moderators');
+
+ async function givePrivsToModerators(cid, groupPrefix) {
+ const members = await db.getSortedSetRevRange(`group:cid:${cid}:privileges:${groupPrefix}moderate:members`, 0, -1);
+ for (const member of members) {
+ await groups.join(['cid:0:privileges:view:users:info'], member);
+ }
}
},
};
diff --git a/src/upgrades/1.12.3/give_mod_privileges.js b/src/upgrades/1.12.3/give_mod_privileges.js
index 03c6c6ff67..cf7439a16b 100644
--- a/src/upgrades/1.12.3/give_mod_privileges.js
+++ b/src/upgrades/1.12.3/give_mod_privileges.js
@@ -1,6 +1,7 @@
+/* eslint-disable no-await-in-loop */
+
'use strict';
-const async = require('async');
const privileges = require('../../privileges');
const groups = require('../../groups');
const db = require('../../database');
@@ -8,7 +9,7 @@ const db = require('../../database');
module.exports = {
name: 'Give mods explicit privileges',
timestamp: Date.UTC(2019, 4, 28),
- method: function (callback) {
+ method: async function () {
const defaultPrivileges = [
'find',
'read',
@@ -43,43 +44,20 @@ module.exports = {
'groups:local:login',
];
- async.waterfall([
- function (next) {
- db.getSortedSetRevRange('categories:cid', 0, -1, next);
- },
- function (cids, next) {
- async.eachSeries(cids, (cid, next) => {
- async.waterfall([
- function (next) {
- givePrivsToModerators(cid, '', next);
- },
- function (next) {
- givePrivsToModerators(cid, 'groups:', next);
- },
- function (next) {
- privileges.categories.give(modPrivileges.map(p => `groups:${p}`), cid, ['Global Moderators'], next);
- },
- ], next);
- }, next);
- },
- function (next) {
- privileges.global.give(globalModPrivs, 'Global Moderators', next);
- },
- ], callback);
+ const cids = await db.getSortedSetRevRange('categories:cid', 0, -1);
+ for (const cid of cids) {
+ await givePrivsToModerators(cid, '');
+ await givePrivsToModerators(cid, 'groups:');
+ await privileges.categories.give(modPrivileges.map(p => `groups:${p}`), cid, ['Global Moderators']);
+ }
+ await privileges.global.give(globalModPrivs, 'Global Moderators');
- function givePrivsToModerators(cid, groupPrefix, callback) {
+ async function givePrivsToModerators(cid, groupPrefix) {
const privGroups = modPrivileges.map(priv => `cid:${cid}:privileges:${groupPrefix}${priv}`);
-
- async.waterfall([
- function (next) {
- db.getSortedSetRevRange(`group:cid:${cid}:privileges:${groupPrefix}moderate:members`, 0, -1, next);
- },
- function (members, next) {
- async.eachSeries(members, (member, next) => {
- groups.join(privGroups, member, next);
- }, next);
- },
- ], callback);
+ const members = await db.getSortedSetRevRange(`group:cid:${cid}:privileges:${groupPrefix}moderate:members`, 0, -1);
+ for (const member of members) {
+ await groups.join(privGroups, member);
+ }
}
},
};
diff --git a/src/upgrades/1.12.3/user_pid_sets.js b/src/upgrades/1.12.3/user_pid_sets.js
index d98b4f9aab..543059705e 100644
--- a/src/upgrades/1.12.3/user_pid_sets.js
+++ b/src/upgrades/1.12.3/user_pid_sets.js
@@ -1,6 +1,6 @@
+
'use strict';
-const async = require('async');
const db = require('../../database');
const batch = require('../../batch');
@@ -10,36 +10,26 @@ const topics = require('../../topics');
module.exports = {
name: 'Create zsets for user posts per category',
timestamp: Date.UTC(2019, 5, 23),
- method: function (callback) {
+ method: async function () {
const { progress } = this;
- batch.processSortedSet('posts:pid', (pids, next) => {
+ await batch.processSortedSet('posts:pid', async (pids) => {
progress.incr(pids.length);
- let postData;
- async.waterfall([
- function (next) {
- posts.getPostsFields(pids, ['pid', 'uid', 'tid', 'upvotes', 'downvotes', 'timestamp'], next);
- },
- function (_postData, next) {
- postData = _postData;
- const tids = postData.map(p => p.tid);
- topics.getTopicsFields(tids, ['cid'], next);
- },
- function (topicData, next) {
- const bulk = [];
- postData.forEach((p, index) => {
- if (p && p.uid && p.pid && p.tid && p.timestamp) {
- bulk.push([`cid:${topicData[index].cid}:uid:${p.uid}:pids`, p.timestamp, p.pid]);
- if (p.votes > 0) {
- bulk.push([`cid:${topicData[index].cid}:uid:${p.uid}:pids:votes`, p.votes, p.pid]);
- }
- }
- });
- db.sortedSetAddBulk(bulk, next);
- },
- ], next);
+ const postData = await posts.getPostsFields(pids, ['pid', 'uid', 'tid', 'upvotes', 'downvotes', 'timestamp']);
+ const tids = postData.map(p => p.tid);
+ const topicData = await topics.getTopicsFields(tids, ['cid']);
+ const bulk = [];
+ postData.forEach((p, index) => {
+ if (p && p.uid && p.pid && p.tid && p.timestamp) {
+ bulk.push([`cid:${topicData[index].cid}:uid:${p.uid}:pids`, p.timestamp, p.pid]);
+ if (p.votes > 0) {
+ bulk.push([`cid:${topicData[index].cid}:uid:${p.uid}:pids:votes`, p.votes, p.pid]);
+ }
+ }
+ });
+ await db.sortedSetAddBulk(bulk);
}, {
progress: progress,
- }, callback);
+ });
},
};
diff --git a/src/user/approval.js b/src/user/approval.js
index 639315f00d..24e84fba64 100644
--- a/src/user/approval.js
+++ b/src/user/approval.js
@@ -43,8 +43,8 @@ module.exports = function (User) {
}
const keys = usernames.filter(Boolean).map(username => `registration:queue:name:${username}`);
const data = await db.getObjectsFields(keys, ['email']);
- const emails = data.map(data => data && data.email);
- if (emails.includes(userData.email)) {
+ const emails = data.map(data => data && data.email).filter(Boolean);
+ if (userData.email && emails.includes(userData.email)) {
throw new Error('[[error:email-taken]]');
}
}
@@ -80,8 +80,8 @@ module.exports = function (User) {
template: 'registration_accepted',
uid: uid,
}).catch(err => winston.error(`[emailer.send] ${err.stack}`));
- const total = await db.incrObjectField('registration:queue:approval:times', 'totalTime', Math.floor((Date.now() - creation_time) / 60000));
- const counter = await db.incrObjectField('registration:queue:approval:times', 'counter', 1);
+ const total = await db.incrObjectFieldBy('registration:queue:approval:times', 'totalTime', Math.floor((Date.now() - creation_time) / 60000));
+ const counter = await db.incrObjectField('registration:queue:approval:times', 'counter');
await db.setObjectField('registration:queue:approval:times', 'average', total / counter);
return uid;
};
diff --git a/src/user/interstitials.js b/src/user/interstitials.js
index 5467711503..3a98b12373 100644
--- a/src/user/interstitials.js
+++ b/src/user/interstitials.js
@@ -57,9 +57,15 @@ Interstitials.email = async (data) => {
// User attempting to edit another user's email -- not allowed
throw new Error('[[error:no-privileges]]');
}
- } else if (current) {
- // User explicitly clearing their email
- await user.email.remove(userData.uid, data.req.session.id);
+ } else {
+ if (meta.config.requireEmailAddress) {
+ throw new Error('[[error:invalid-email]]');
+ }
+
+ if (current) {
+ // User explicitly clearing their email
+ await user.email.remove(userData.uid, data.req.session.id);
+ }
}
} else {
// New registrants have the confirm email sent from user.create()
diff --git a/src/user/settings.js b/src/user/settings.js
index 4e657a605d..bdf4fb6f8b 100644
--- a/src/user/settings.js
+++ b/src/user/settings.js
@@ -148,7 +148,7 @@ module.exports = function (User) {
settings[notificationType] = data[notificationType];
}
});
- const result = await plugins.hooks.fire('filter:user.saveSettings', { settings: settings, data: data });
+ const result = await plugins.hooks.fire('filter:user.saveSettings', { uid: uid, settings: settings, data: data });
await db.setObject(`user:${uid}:settings`, result.settings);
await User.updateDigestSetting(uid, data.dailyDigestFreq);
return await User.getSettings(uid);
diff --git a/src/views/admin/partials/privileges/global.tpl b/src/views/admin/partials/privileges/global.tpl
index eec5fab737..b0a971e11b 100644
--- a/src/views/admin/partials/privileges/global.tpl
+++ b/src/views/admin/partials/privileges/global.tpl
@@ -1,6 +1,20 @@
+ {{{ if !isAdminPriv }}}
+
+
+ [[admin/manage/categories:privileges.section-posting]]
+
+
+ [[admin/manage/categories:privileges.section-viewing]]
+
+
+ [[admin/manage/categories:privileges.section-moderation]]
+
+
[[admin/manage/categories:privileges.section-group]]
[[admin/manage/privileges:select-clear-all]]
diff --git a/src/views/admin/settings/email.tpl b/src/views/admin/settings/email.tpl
index 1a8e98177e..9d33950d7a 100644
--- a/src/views/admin/settings/email.tpl
+++ b/src/views/admin/settings/email.tpl
@@ -27,6 +27,14 @@
+
+
+
+ [[admin/settings/email:require-email-address-warning]]
+
-
+
[[admin/settings/email:smtp-transport.username-help]]
-
+
diff --git a/src/views/partials/data/category.tpl b/src/views/partials/data/category.tpl
index 2144c8a84c..3de7588b92 100644
--- a/src/views/partials/data/category.tpl
+++ b/src/views/partials/data/category.tpl
@@ -1 +1 @@
-data-tid="{topics.tid}" data-index="{topics.index}" data-cid="{topics.cid}" itemprop="itemListElement"
\ No newline at end of file
+data-tid="{topics.tid}" data-index="{topics.index}" data-cid="{topics.cid}" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"
\ No newline at end of file
diff --git a/test/authentication.js b/test/authentication.js
index 8a8d5886e4..87d3b9f186 100644
--- a/test/authentication.js
+++ b/test/authentication.js
@@ -455,7 +455,15 @@ describe('authentication', () => {
loginUser(bannedUser.username, bannedUser.pw, (err, res, body) => {
assert.ifError(err);
assert.equal(res.statusCode, 403);
- assert.equal(body, '[[error:user-banned-reason, spammer]]');
+ delete body.timestamp;
+ assert.deepStrictEqual(body, {
+ banned_until: 0,
+ banned_until_readable: '',
+ expiry: 0,
+ expiry_readable: '',
+ reason: 'spammer',
+ uid: 6,
+ });
user.bans.unban(bannedUser.uid, (err) => {
assert.ifError(err);
const expiry = Date.now() + 10000;
@@ -464,7 +472,8 @@ describe('authentication', () => {
loginUser(bannedUser.username, bannedUser.pw, (err, res, body) => {
assert.ifError(err);
assert.equal(res.statusCode, 403);
- assert.equal(body, `[[error:user-banned-reason-until, ${utils.toISOString(expiry)}, No reason given.]]`);
+ assert(body.banned_until);
+ assert(body.reason, '[[user:info.banned-no-reason]]');
done();
});
});
diff --git a/test/database/list.js b/test/database/list.js
index 2d4c3ac454..f6f500f2f7 100644
--- a/test/database/list.js
+++ b/test/database/list.js
@@ -188,6 +188,15 @@ describe('List methods', () => {
done();
});
});
+
+ it('should remove multiple elements from list', async () => {
+ await db.listAppend('multiRemoveList', ['a', 'b', 'c', 'd', 'e']);
+ const initial = await db.getListRange('multiRemoveList', 0, -1);
+ assert.deepStrictEqual(initial, ['a', 'b', 'c', 'd', 'e']);
+ await db.listRemoveAll('multiRemoveList', ['b', 'd']);
+ const values = await db.getListRange('multiRemoveList', 0, -1);
+ assert.deepStrictEqual(values, ['a', 'c', 'e']);
+ });
});
describe('listTrim()', () => {
diff --git a/test/emailer.js b/test/emailer.js
index 17e639f0b9..ea19af58f4 100644
--- a/test/emailer.js
+++ b/test/emailer.js
@@ -87,7 +87,7 @@ describe('emailer', () => {
assert.equal(output, text);
done();
});
- }, 500);
+ }, 2000);
});
});
});
diff --git a/test/topics.js b/test/topics.js
index 10a808f530..de44b53ed0 100644
--- a/test/topics.js
+++ b/test/topics.js
@@ -879,14 +879,14 @@ describe('Topic\'s', () => {
});
it('should error with unprivileged user', (done) => {
- socketTopics.orderPinnedTopics({ uid: 0 }, [{ tid: tid1 }, { tid: tid2 }], (err) => {
+ socketTopics.orderPinnedTopics({ uid: 0 }, { tid: tid1, order: 1 }, (err) => {
assert.equal(err.message, '[[error:no-privileges]]');
done();
});
});
it('should not do anything if topics are not pinned', (done) => {
- socketTopics.orderPinnedTopics({ uid: adminUid }, [{ tid: tid3 }], (err) => {
+ socketTopics.orderPinnedTopics({ uid: adminUid }, { tid: tid3, order: 1 }, (err) => {
assert.ifError(err);
db.isSortedSetMember(`cid:${topic.categoryId}:tids:pinned`, tid3, (err, isMember) => {
assert.ifError(err);
@@ -901,7 +901,7 @@ describe('Topic\'s', () => {
assert.ifError(err);
assert.equal(pinnedTids[0], tid2);
assert.equal(pinnedTids[1], tid1);
- socketTopics.orderPinnedTopics({ uid: adminUid }, [{ tid: tid1, order: 1 }, { tid: tid2, order: 0 }], (err) => {
+ socketTopics.orderPinnedTopics({ uid: adminUid }, { tid: tid1, order: 0 }, (err) => {
assert.ifError(err);
db.getSortedSetRevRange(`cid:${topic.categoryId}:tids:pinned`, 0, -1, (err, pinnedTids) => {
assert.ifError(err);