diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml index a2cd1284a21..7ed783d7932 100644 --- a/config/locales/server.ar.yml +++ b/config/locales/server.ar.yml @@ -884,7 +884,7 @@ ar: download_remote_images_to_local: "تحويل الصور البعيدة إلى صور محلية بواسطة تحميلها؛ بإستثناء الصور التالفة" download_remote_images_threshold: "ادني مساحه للقرص ضروربه لتحميل الصور البعيده محليا ( في المئه) " disabled_image_download_domains: "الصور البعيدة لن يتم تنزيلها من هذا المجال. قائمة Pipe-delimited." - ninja_edit_window: "ل(n) ثواني بعد النشر، التعديل الذي سيتم لن يصنع نسخه جديده في القائمه التاريخيه للمنشورات" + editing_grace_period: "ل(n) ثواني بعد النشر، التعديل الذي سيتم لن يصنع نسخه جديده في القائمه التاريخيه للمنشورات" post_edit_time_limit: "الكاتب يتستطيع تعديل و مسح مشاركته لعده (n) دقائق بعد النشر. اضبطه للعدد0 للابد" edit_history_visible_to_public: "اسمح لاي شخص ان يرى النسخ السابقه للمنشورات المعدله. عندما يتم تعطيلها.،فقط اعضاء فريق العمل يمكنهم رؤيتها " delete_removed_posts_after: "المشاركات التي تم إزالتها عن طريق الكتاب سيتم مسحها اوتوماتيكياً بعد(n) ساعات ة. اذا تم ضبطها علي 0، سيتم مسح المشاركه فوراً" diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml index 4dcc06c6067..f86ccdfc5e4 100644 --- a/config/locales/server.bs_BA.yml +++ b/config/locales/server.bs_BA.yml @@ -453,7 +453,7 @@ bs_BA: download_remote_images_to_local: "Convert remote images to local images by downloading them; this prevents broken images." download_remote_images_threshold: "Minimum disk space necessary to download remote images locally (in percent)" disabled_image_download_domains: "Remote images will never be downloaded from these domains. Pipe-delimited list." - ninja_edit_window: "For (n) seconds after posting, editing will not create a new version in the post history." + editing_grace_period: "For (n) seconds after posting, editing will not create a new version in the post history." post_edit_time_limit: "The author can edit or delete their post for (n) minutes after posting. Set to 0 for forever." edit_history_visible_to_public: "Allow everyone to see previous versions of an edited post. When disabled, only staff members can view." delete_removed_posts_after: "Posts removed by the author will be automatically deleted after (n) hours. If set to 0, posts will be deleted immediately." diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml index 9b8f27b4502..6506bdcee36 100644 --- a/config/locales/server.de.yml +++ b/config/locales/server.de.yml @@ -713,7 +713,7 @@ de: download_remote_images_to_local: "Lade eine Kopie von extern gehosteten Bildern herunter und ersetze Links in Beiträgen entsprechend; dies verhindert defekte Bilder." download_remote_images_threshold: "Minimal benötigter freier Festplattenspeicher um externe Bilder lokal herunterzuladen (in Prozent)" disabled_image_download_domains: "Liste von Domänen, von denen verlinkte Bilder niemals heruntergeladen werden sollen." - ninja_edit_window: "Für (n) Sekunden wird nach dem Bearbeiten keine neue Revision im Beitragsverlauf angelegt." + editing_grace_period: "Für (n) Sekunden wird nach dem Bearbeiten keine neue Revision im Beitragsverlauf angelegt." post_edit_time_limit: "Der Verfasser eines Beitrags kann diesen nur für (n) Minuten nach Absenden des Beitrags bearbeiten. 0 deaktiviert diese Beschränkung." edit_history_visible_to_public: "Erlaube jedem, vorherige Versionen eines bearbeiteten Beitrags zu sehen. Wenn deaktiviert sind diese nur für Mitarbeiter sichtbar." delete_removed_posts_after: "Beiträge, die deren Verfasser selbst entfernt hat, werden nach (n) Stunden automatisch gelöscht. Die Beiträge werden sofort gelöscht, wenn dieser Wert auf 0 gesetzt wird." diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index a5d59872d6e..58af6505870 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -806,7 +806,7 @@ en: download_remote_images_to_local: "Convert remote images to local images by downloading them; this prevents broken images." download_remote_images_threshold: "Minimum disk space necessary to download remote images locally (in percent)" disabled_image_download_domains: "Remote images will never be downloaded from these domains. Pipe-delimited list." - ninja_edit_window: "For (n) seconds after posting, editing will not create a new version in the post history." + editing_grace_period: "For (n) seconds after posting, editing will not create a new version in the post history." post_edit_time_limit: "The author can edit or delete their post for (n) minutes after posting. Set to 0 for forever." edit_history_visible_to_public: "Allow everyone to see previous versions of an edited post. When disabled, only staff members can view." delete_removed_posts_after: "Posts removed by the author will be automatically deleted after (n) hours. If set to 0, posts will be deleted immediately." diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml index 2f024db5303..0969f828cc0 100644 --- a/config/locales/server.es.yml +++ b/config/locales/server.es.yml @@ -724,7 +724,7 @@ es: download_remote_images_to_local: "Convertir imágenes remotas a imágenes locales descargándolas; esto previene imágenes rotas." download_remote_images_threshold: "Mínimo espacio en disco necesario para descargar imágenes remotas de forma local (porcentaje)" disabled_image_download_domains: "Las imágenes remotas que provengan de estos dominios no serán descargadas. Lista delimitada por barras." - ninja_edit_window: "Durante (n) segundos después de publicar un post, se puede editar ese post sin crear una nueva versión en el historial." + editing_grace_period: "Durante (n) segundos después de publicar un post, se puede editar ese post sin crear una nueva versión en el historial." post_edit_time_limit: "El autor puede editar o eliminar su post durante (n) minutos después de publicarlo. Pon un 0 para que pueda hacerlo siempre." edit_history_visible_to_public: "Permitir a todos ver las versiones previas de un post editado. Si se deshabilita, solo los miembros del staff podrán verlas." delete_removed_posts_after: "Los posts borrados por su autor serán automáticamente eliminados después de (n) horas. Si se establece este valor a 0, los posts serán eliminados automáticamente." diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml index c80487b8adc..49d916d6de7 100644 --- a/config/locales/server.fa_IR.yml +++ b/config/locales/server.fa_IR.yml @@ -620,7 +620,7 @@ fa_IR: download_remote_images_to_local: "تبدیل عکس های سیار به عکس های محلی با دانلود کردن آنها; این مانع از شکستن عکس ها می شود." download_remote_images_threshold: "حداقل فضای دیسک مورد نیاز برای دانلود عکس های سیار محلی (در درصد)" disabled_image_download_domains: "عکس های سیار هرگز دانلود نخواهند شد از این دامنه ها. لیست Pipe-delimited" - ninja_edit_window: "برای (n) ثانیه بعد از نوشتن ویرایش کردن٬ نسخه جدیدی در سابقه نوشته نمی سازد." + editing_grace_period: "برای (n) ثانیه بعد از نوشتن ویرایش کردن٬ نسخه جدیدی در سابقه نوشته نمی سازد." post_edit_time_limit: " نویسنده می تواند نوشته را ویرایش یا حذف کند بعد از (n) ساعت پست کردن آن. تنظیم به 0 برای همیشه." edit_history_visible_to_public: "به همه اجازه بده تا نسخه قبلی نوشته ویرایش شده را ببینند. وقتی غیر فعال است٬ فقی اعضل می توانند ببینند." delete_removed_posts_after: "نوشته های حذف شده توسط نویسنده بطور خودکار پاک می شوند بعد از (n) ساعت. اگر به 0 تنظیم شود همان موقع پاک خواهند شد. " diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml index ee5267809d4..ce6cdd9e302 100644 --- a/config/locales/server.fi.yml +++ b/config/locales/server.fi.yml @@ -712,7 +712,7 @@ fi: download_remote_images_to_local: "Muunna linkatut kuvat liitetiedostoiksi lataamalla ne; tämä estää kuvien rikkoontumisen vanhentuneiden linkkien vuoksi." download_remote_images_threshold: "Vähin vapaa tila, jotta linkatut kuvat ladataan (prosenteissa)" disabled_image_download_domains: "Linkattuja kuvia ei koskaan ladata näistä verkkotunnuksista. Pystyviivalla eroteltu lista." - ninja_edit_window: "Muokkaus ei tallenna erillistä versiota viestihistoriaan (n) sekunnin aikana viestin lähettämisen jälkeen." + editing_grace_period: "Muokkaus ei tallenna erillistä versiota viestihistoriaan (n) sekunnin aikana viestin lähettämisen jälkeen." post_edit_time_limit: "Kirjoittaja voi muokata tai poistaa viestinsä (n) minuuttia lähettämisen jälkeen. Aseta 0 poistaaksesi rajoituksen kokonaan." edit_history_visible_to_public: "Salli kaikkien nähdä muokatun viestin edelliset versiot. Jos asetus otetaan pois käytöstä, vain henkilökunta näkee versiot." delete_removed_posts_after: "Kirjoittajalta poistetut viestit poistetaan automaattisesti (n) tunnin kuluttua. Jos asetetaan 0, viestit poistetaan välittömästi." diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml index fda48c7407a..2c9a33484e4 100644 --- a/config/locales/server.fr.yml +++ b/config/locales/server.fr.yml @@ -698,7 +698,7 @@ fr: download_remote_images_to_local: "Transformer les images distantes en images locales en les téléchargeant; cela permet d'éviter les liens morts." download_remote_images_threshold: "Quantité minimum d'espace disque requise pour télécharger localement des images distantes (en pourcentage)" disabled_image_download_domains: "Les images distantes de ces domaines ne seront jamais téléchargés. Liste délimitée par un pipe (|)." - ninja_edit_window: "Pendant (n) secondes après la publication d'un message, l'édition de ce dernier ne provoquera pas d'historisation." + editing_grace_period: "Pendant (n) secondes après la publication d'un message, l'édition de ce dernier ne provoquera pas d'historisation." post_edit_time_limit: "L'auteur peut modifier ou supprimer ses messages pendant (n) minutes après leurs publications. Mettre à 0 pour l'autoriser sans limite de temps." edit_history_visible_to_public: "Autoriser tout le monde à voir les versions précédentes d'un message modifié. Quand désactivé, seuls les membres de l'équipe peuvent voir l'historique." delete_removed_posts_after: "Les messages retirés par leur auteur seront automatiquement supprimés après (n) heures. Pour une valeur renseignée à 0, les messages seront supprimés immédiatement." diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml index ae514a9b6ad..1ad127a269a 100644 --- a/config/locales/server.he.yml +++ b/config/locales/server.he.yml @@ -689,7 +689,7 @@ he: download_remote_images_to_local: "המרת תמונות מרחוק לתמונות מקומיות באמצעות הורדות; למניעת שגיאות של תמונות חסרות" download_remote_images_threshold: "שטח האכסון המינימלי (באחוזים) הנדרש להורדת תמונות באופן מקומי" disabled_image_download_domains: "תמונות מרחוק לעולם לא יורדו ממתחמים (domains) אלו. " - ninja_edit_window: "במשך (n) שניות לאחר הפרסום, עריכה לא תיצור גרסא חדשה בהיסטוריית הגרסאות." + editing_grace_period: "במשך (n) שניות לאחר הפרסום, עריכה לא תיצור גרסא חדשה בהיסטוריית הגרסאות." post_edit_time_limit: "העורכ/ת יכול לערות או למחקור את הפרסום שלהם במשך (0) דקות לאחר הפרסום. הזינו 0 כ\"תמיד\"." edit_history_visible_to_public: "אפשרו לכולם לראות גרסאות קודמות של פרסום ערוך. כאשר אפשרות זו מנוטרלת, רק חברי צוות יכולים לצפות בהן." delete_removed_posts_after: "פרסומים שהוסרו על ידי מחבריהם ימחקו באופן אוטומטי לאחר (n) שעות. אם הגדרה זו מכוונת ל-0, הפרסום ימחקו מיידית." diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml index d570af61300..4e606f227fe 100644 --- a/config/locales/server.it.yml +++ b/config/locales/server.it.yml @@ -653,7 +653,7 @@ it: download_remote_images_to_local: "Scarica localmente le immagini remote; ciò permettei di evitare immagini assenti." download_remote_images_threshold: "Minimo spazio disco necessario per scaricare le immagini remote in locale (in percentuale)" disabled_image_download_domains: "Le immagini non verranno mai scaricate dai seguenti domini. Elenco delimitato dal carattere pipe |" - ninja_edit_window: "Per (n) secondi dopo la creazione del messaggio, le modifiche non saranno tracciate nella cronologia." + editing_grace_period: "Per (n) secondi dopo la creazione del messaggio, le modifiche non saranno tracciate nella cronologia." post_edit_time_limit: "L'autore può modificare o cancellare il proprio messaggio per (n) minuti dopo averlo inserito. Metti 0 per sempre." edit_history_visible_to_public: "Permetti a tutti di vedere le precedenti versioni di un messaggio modificato. Se disabilitato solo i membri dello staff possono vederle." delete_removed_posts_after: "I messaggi rimossi dall'autore saranno automaticamente cancellati dopo (n) ore. Se impostato a 0, i messaggi saranno cancellati subito." diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml index e730525e017..d825d80dac1 100644 --- a/config/locales/server.ja.yml +++ b/config/locales/server.ja.yml @@ -601,7 +601,7 @@ ja: download_remote_images_to_local: "リモート画像をダウンロードしてローカル画像に変換する。破損した画像を防ぎます" download_remote_images_threshold: "リモート画像をダウンロードするために必要なディスクスペースの最低残容量 (パーセント)" disabled_image_download_domains: "これらのドメインからは、リモート画像のダウンロードを行いません。パイプ区切りのリスト" - ninja_edit_window: "投稿から(N)秒間は、ポストの新しいバージョンを作成しない" + editing_grace_period: "投稿から(N)秒間は、ポストの新しいバージョンを作成しない" post_edit_time_limit: "作者は投稿から(N)分間、編集と削除が可能。0を設定すると無期限です" edit_history_visible_to_public: "すべてのユーザに対してポストの編集履歴を許可する。無効の場合はスタッフメンバーのみが確認できます" delete_removed_posts_after: "投稿は作者が削除してから(N)時間後に削除されます。0を設定すると、すぐに削除されます" diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml index 0cc3f52ff8d..2e0088e5823 100644 --- a/config/locales/server.ko.yml +++ b/config/locales/server.ko.yml @@ -602,7 +602,7 @@ ko: download_remote_images_to_local: "이미지를 다운로드하면 원격 이미지를 로컬이미지로 변경. 이미지가 깨지는 것을 막을 수 있습니다." download_remote_images_threshold: "원격의 이미지를 로컬에 다운받기 위한 최소 디스크 공간(%)" disabled_image_download_domains: "이 도메인을 통해서 원격 이미지를 다운로드 하지 않는다. ` | `를 구분자로 한 리스트" - ninja_edit_window: "편집을 결과가 새로운 버전을 생성하지 않는 포스팅 이후에 경과할 시간(초)" + editing_grace_period: "편집을 결과가 새로운 버전을 생성하지 않는 포스팅 이후에 경과할 시간(초)" post_edit_time_limit: "글 작성자가 해당 글을 편집하거나 삭제할 수 있도록 허용되는 시간(분). 0으로 설정하면 언제든지 편집이나 삭제가 허용됨." edit_history_visible_to_public: "모든 사용자가 글의 수정 내역을 볼 수 있도록 허용. 비활성화시 스태프 맴버만 수정 내역을 볼 수 있음." delete_removed_posts_after: "작성자에 의해 삭제된 글은 (n) 시간 뒤 자동으로 삭제됩니다. 0으로 설정 시, 즉시 삭제됩니다." diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml index a5e8ee4fe45..9668feea359 100644 --- a/config/locales/server.nb_NO.yml +++ b/config/locales/server.nb_NO.yml @@ -627,7 +627,7 @@ nb_NO: download_remote_images_to_local: "Konverter eksterne bilder ved å laste de ned lokalt, dette forhindrer ødelagte bilder." download_remote_images_threshold: "Minimum ledig diskplass for å kunne laste ned eksterne bilder (i prosent)" disabled_image_download_domains: "Eksterne bilder vil aldri bli lastet ned fra disse domenene (pipe-separert liste)." - ninja_edit_window: "Endring innen (n) sekunder etter oppretting av innlegg vil ikke lage ny versjon av innlegget." + editing_grace_period: "Endring innen (n) sekunder etter oppretting av innlegg vil ikke lage ny versjon av innlegget." post_edit_time_limit: "Forfattere kan redigere eller slette innleggene sine (n) minutter etter opprettelse. Sett 0 for uendelig." edit_history_visible_to_public: "Alle kan se tidligere versjoner av et redigert innlegg. Hvis det er slått av kan kun stab se det." delete_removed_posts_after: "Innlegg som blir fjernet av forfatter blir automatisk slettet etter (n) timer. Sett til 0 og innleggene blir slettet øyeblikkelig." diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml index eb72d03281d..accd8b25368 100644 --- a/config/locales/server.nl.yml +++ b/config/locales/server.nl.yml @@ -720,7 +720,7 @@ nl: download_remote_images_to_local: "Download externe afbeeldingen en sla ze lokaal op. Dit voorkomt dat afbeeldingen niet meer beschikbaar zouden kunnen worden." download_remote_images_threshold: "Minimum schijfruimte vereist om externe afbeeldingen lokaal te downloaden (percentage)" disabled_image_download_domains: "Externe afbeeldingen zullen nooit gedownload worden van deze domeinen. Pipe-gescheiden lijst." - ninja_edit_window: "Hoe snel je een aanpassing kan maken zonder dat er een nieuwe versie wordt opgeslagen, in (n) seconden." + editing_grace_period: "Hoe snel je een aanpassing kan maken zonder dat er een nieuwe versie wordt opgeslagen, in (n) seconden." post_edit_time_limit: "Berichten mogen na (n) minuten nog gewijzigd of verwijderd worden door de schrijver. Gebruik 0 voor onbeperkt." edit_history_visible_to_public: "Sta toe dat iedereen vorige versies van een gewijzigd bericht kan zien. Als dit uit staat kunnen alleen stafleden dit zien." delete_removed_posts_after: "Berichten verwijderd door de auteur zullen automatisch verwijderd worden na (n) uur. Als dit ingesteld is op 0 zullen berichten direct verwijderd worden." diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml index 74e7e5d6266..bd2b4704e5a 100644 --- a/config/locales/server.pl_PL.yml +++ b/config/locales/server.pl_PL.yml @@ -714,7 +714,7 @@ pl_PL: download_remote_images_to_local: "Pobieraj zdalne grafiki i twórz ich lokalne kopie aby zapobiegać uszkodzonym/brakującym obrazkom na stronach." download_remote_images_threshold: "Minimalna ilość wolnego miejsca na dysku wymagana przez funkcję pobierania zdalnych grafik (w procentach)" disabled_image_download_domains: "Zdalne grafiki z tych domen nie będą pobierane." - ninja_edit_window: "Przez tyle sekund po utworzeniu nowego wpisu jego kolejne edycje nie będą tworzyć nowych wersji w historii wpisu." + editing_grace_period: "Przez tyle sekund po utworzeniu nowego wpisu jego kolejne edycje nie będą tworzyć nowych wersji w historii wpisu." post_edit_time_limit: "Autor może edytować lub usunąć swój wpis przez tyle minut po jego utworzeniu. Ustawienie 0 oznacza 'zawsze'." edit_history_visible_to_public: "Pozwól wszystkim przeglądać poprzednie wersje edytowanych wpisów. Gdy wyłączone, jedynie obsługa/staff może." delete_removed_posts_after: "Wpisy usunięte przez autora będą automatycznie zlikwidowane po (n) godzinach. Jeżeli liczba godzin będzie wynosić 0, to zostaną usunięte natychmiast. " diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml index 5a827dbaa68..abc1c97faa7 100644 --- a/config/locales/server.pt.yml +++ b/config/locales/server.pt.yml @@ -736,7 +736,7 @@ pt: download_remote_images_to_local: "Converter imagens remotas em imagens locais ao descarregá-las; isto previne imagens corrompidas." download_remote_images_threshold: "Espaço mínimo necessário em disco para descarregar imagens remotas localmente (em percentagem)" disabled_image_download_domains: "Imagens remotas não serão descarregadas destes domínios. " - ninja_edit_window: "Durante (n) segundos após a publicação da mensagem, editá-la não irá criar uma nova versão no histórico de mensagens." + editing_grace_period: "Durante (n) segundos após a publicação da mensagem, editá-la não irá criar uma nova versão no histórico de mensagens." post_edit_time_limit: "O autor pode editar ou eliminar a sua mensagem por um período de (n) minutos após a publicação da mesma. Definir a 0 para ser para sempre." edit_history_visible_to_public: "Permitir que todos vejam versões anteriores de uma mensagem editada. Quando desativado, apenas membros do pessoal podem ver." delete_removed_posts_after: "Mensagens removidas pelo autor serão automaticamente eliminadas após um período de (n) horas. Se estiver definido a 0, as mensagens serão eliminadas imediatamente." diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml index 00c90eea5c5..c057e96cbdc 100644 --- a/config/locales/server.pt_BR.yml +++ b/config/locales/server.pt_BR.yml @@ -667,7 +667,7 @@ pt_BR: download_remote_images_to_local: "Converta imagens remotas para imagens locais, transferindo-as; isto evita imagens quebradas." download_remote_images_threshold: "Espaço mínimo necessário para download das imagens ( em % )" disabled_image_download_domains: "Imagens hospedadas nestes domínios nunca serão baixadas. \nLista delimitada por |" - ninja_edit_window: "Pelos próximos (n) segundos após a postagem, as edições não terão histórico." + editing_grace_period: "Pelos próximos (n) segundos após a postagem, as edições não terão histórico." post_edit_time_limit: "O autor pode editar ou apagar o seu post para (n) minutos após a postagem. Defina como 0 para sempre." edit_history_visible_to_public: "Permitir que todos vejam as versões anteriores de uma postagem editada. Quando desativado, somente membros da equipe podem ver o histórico de alterações." delete_removed_posts_after: "Postagens removidas pelo autor serão automaticamente deletadas depois de (n) horas. Se o valor definido for 0, as postagens serão deletadas imediatamente." diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml index 6bafa02d359..6834d646cd7 100644 --- a/config/locales/server.ro.yml +++ b/config/locales/server.ro.yml @@ -591,7 +591,7 @@ ro: download_remote_images_to_local: "Transformă imaginile de legătură în imagini locale downloadându-le; asta previne stricarea imaginilor." download_remote_images_threshold: "Spațiul mimin necesar pentru download-ul imaginilor de legătura local (în procente)" disabled_image_download_domains: "Imagini de legătură nu vor mai fi downloadate din aceste domenii. Listă delimitata-vertical." - ninja_edit_window: "Pentru (n) secunde după postare, editarea nu va crea o versune nouă în istoricul postării." + editing_grace_period: "Pentru (n) secunde după postare, editarea nu va crea o versune nouă în istoricul postării." post_edit_time_limit: "Autorul poate edita sau șterge postarea până la (n) minute după postare. Setați 0 pentru totdeauna." edit_history_visible_to_public: "Permite oricui să vadă versiunea precedentă a unei postări editate. Când e dezactivat, doar membrii personalului pot vedea." delete_removed_posts_after: "Postările înlăturate de către autor vor fi automat șterse după (n) de ore." diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml index 69f81910e36..12aff0120b0 100644 --- a/config/locales/server.ru.yml +++ b/config/locales/server.ru.yml @@ -731,7 +731,7 @@ ru: download_remote_images_to_local: "Скачивать картинки, вставленные в сообщения ссылками на другие сайты, и хранить их локально, чтобы предотвратить их изменения или утерю." download_remote_images_threshold: "Минимальное доступное место на диске (в процентах), при котором разрешено автоматическое скачивание картинок для локального хранения." disabled_image_download_domains: "Список доменов, разделенный знаком \"|\", в которых не нужно скачивать картинки." - ninja_edit_window: "Количество секунд после отправки соощения, в течении которых правка сообщения не будет записываться в историю правок." + editing_grace_period: "Количество секунд после отправки соощения, в течении которых правка сообщения не будет записываться в историю правок." post_edit_time_limit: "Сколько минут после отправки сообщения автор может удалять или редактировать его. 0 - без ограничений." edit_history_visible_to_public: "Позволить обычным пользователям просматривать старые версии сообщений. Если исключено, история редакций будет видима только персоналу." delete_removed_posts_after: "Сообщение, которое удалено автором, будет автоматически удалено через (n) часов. Если установлено 0, то сообщение будет удалено немедленно." diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml index 4467eb9a8ac..8d67b2da475 100644 --- a/config/locales/server.sq.yml +++ b/config/locales/server.sq.yml @@ -675,7 +675,7 @@ sq: download_remote_images_to_local: "Convert remote images to local images by downloading them; this prevents broken images." download_remote_images_threshold: "Minimum disk space necessary to download remote images locally (in percent)" disabled_image_download_domains: "Remote images will never be downloaded from these domains. Pipe-delimited list." - ninja_edit_window: "For (n) seconds after posting, editing will not create a new version in the post history." + editing_grace_period: "For (n) seconds after posting, editing will not create a new version in the post history." post_edit_time_limit: "The author can edit or delete their post for (n) minutes after posting. Set to 0 for forever." edit_history_visible_to_public: "Allow everyone to see previous versions of an edited post. When disabled, only staff members can view." delete_removed_posts_after: "Posts removed by the author will be automatically deleted after (n) hours. If set to 0, posts will be deleted immediately." diff --git a/config/locales/server.te.yml b/config/locales/server.te.yml index 2a15a927425..e805c8d2207 100644 --- a/config/locales/server.te.yml +++ b/config/locales/server.te.yml @@ -541,7 +541,7 @@ te: title: "ఈ సైట్ యొక్క పేరు ,టైటిల్ ట్యాగ్ లో ఉపయోగించారు." site_description: "మెటా వివరణ ట్యాగ్ ఉపయోగించి ఈ సైట్‌ని ఒక వాక్యంలో వివరించండి." download_remote_images_threshold: "సుదూర చిత్రాలను స్థానికంగా దిగుమతి చేయడానికి అవసరమయ్యే కనీస డిస్క్ స్థలం (శాతం లో)" - ninja_edit_window: "టపా చేసిన తర్వాత (n) సెకన్లు, టపా చరిత్రలో ఒక కొత్త కధనం సృష్టించడానికి సవరింపు కుదరదు." + editing_grace_period: "టపా చేసిన తర్వాత (n) సెకన్లు, టపా చరిత్రలో ఒక కొత్త కధనం సృష్టించడానికి సవరింపు కుదరదు." post_edit_time_limit: "రచయిత వారు చేసిన టపా (n) నిమిషాల తర్వాత సవరించవచ్చు లేదా తొలగించవచ్చు. ఎప్పటికీ 0 అమర్చుము." max_image_width: "ఒక టపాలో థంబ్నైల్ గరిష్ట వెడల్పు" max_image_height: "ఒక టపాలో థంబ్నైల్ గరిష్ట ఎత్తు" diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml index 52fec44c77b..529015e4ff9 100644 --- a/config/locales/server.tr_TR.yml +++ b/config/locales/server.tr_TR.yml @@ -624,7 +624,7 @@ tr_TR: download_remote_images_to_local: "Uzaktaki resimler yerel resimlere çevirmek için indirilsin; bu ayar resim bağlantılarının kırılmasını önleyecektir" download_remote_images_threshold: "Uzaktaki resimlerin yerele indirilmesi için gereken en az disk alanı (yüzdesel)" disabled_image_download_domains: "Bu alan adlarından hiç bir zaman uzaktan resim indirme. Sınırlandırılmış liste." - ninja_edit_window: "Gönderi oluşturulduktan (n) saniye içerisinde bir düzenleme yapıldığında, gönderi tarihinde yeni bir versiyon yaratma." + editing_grace_period: "Gönderi oluşturulduktan (n) saniye içerisinde bir düzenleme yapıldığında, gönderi tarihinde yeni bir versiyon yaratma." post_edit_time_limit: "Yazar gönderiyi yayınladıktan sonra (n) dakika içerisinde gönderiyi düzenleyebilir ya da silebilir. Sonsuz için 0 girin." edit_history_visible_to_public: "Düzenlenmiş gönderinin eski versiyonlarını herkesin görmesine izin ver. Bu özellik kapatıldığında, eski versiyonları sadece görevliler görebilir." delete_removed_posts_after: "Yazar tarafından kaldırılan gönderiler (n) saat sonra otomatik olarak silinecektir. 0 olarak ayarlanırsa, gönderiler beklemeden hemen silinir." diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml index 3b7fdee796d..c0fa89944a3 100644 --- a/config/locales/server.zh_CN.yml +++ b/config/locales/server.zh_CN.yml @@ -676,7 +676,7 @@ zh_CN: download_remote_images_to_local: "下载一份主题中链接的外部图片到本地；以防图片损坏。" download_remote_images_threshold: "本地最小可用下载外部图片到本地的空间（百分比）" disabled_image_download_domains: "域名列表，链接到这些站点的图片不会被下载。用 | 分割。" - ninja_edit_window: "在多少秒钟（n）之内，对帖子的编辑不生成帖子历史" + editing_grace_period: "在多少秒钟（n）之内，对帖子的编辑不生成帖子历史" post_edit_time_limit: "作者可以在发布帖子后的(n)分钟内编辑或删除他们的帖子。设置 0 为永远。" edit_history_visible_to_public: "允许任何人查看编辑过的帖子的老版本。当禁用时，只有职员才能查看浏览。" delete_removed_posts_after: "帖子被作者删除，将在(n)小时后被自动删除。" diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml index 09df7b5a595..16dec943bdf 100644 --- a/config/locales/server.zh_TW.yml +++ b/config/locales/server.zh_TW.yml @@ -547,7 +547,7 @@ zh_TW: download_remote_images_to_local: "下載外部鏈接的圖片到本機；以防圖片損壞。" download_remote_images_threshold: "可用來下載外部圖片到本機最少的空間（百分比）" disabled_image_download_domains: "在此列表的網域名稱的遠端圖片將不會進行下載，用 | 分割多個域名" - ninja_edit_window: "在 (n) 秒內 ，文章的編輯不產生新的文章版本歷史" + editing_grace_period: "在 (n) 秒內 ，文章的編輯不產生新的文章版本歷史" post_edit_time_limit: "作者可以在發表文章後的 ( n ) 分鐘內編輯或刪除他們的文章，設 0 為永遠" edit_history_visible_to_public: "允許任何人查看編輯過的帖子的舊版本。當禁用時，只有職員才能查看。" delete_removed_posts_after: "帖子被作者刪除，將在 (n) 小時後被自動刪除。如果設置為 0，帖子將被立即刪除。" diff --git a/config/site_settings.yml b/config/site_settings.yml index 3b24da3b3a8..356aeeb776c 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -401,7 +401,7 @@ posting: enable_private_messages: default: true client: true - ninja_edit_window: 300 + editing_grace_period: 300 post_edit_time_limit: 86400 edit_history_visible_to_public: client: true diff --git a/db/migrate/20151124192339_rename_ninja_edit.rb b/db/migrate/20151124192339_rename_ninja_edit.rb new file mode 100644 index 00000000000..1b36d4308c3 --- /dev/null +++ b/db/migrate/20151124192339_rename_ninja_edit.rb @@ -0,0 +1,5 @@ +class RenameNinjaEdit < ActiveRecord::Migration + def change + execute "UPDATE site_settings SET name = 'editing_grace_period' WHERE name = 'ninja_edit_window'" + end +end diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb index ad0a3063340..11b0bc26484 100644 --- a/lib/cooked_post_processor.rb +++ b/lib/cooked_post_processor.rb @@ -292,7 +292,7 @@ class CookedPostProcessor # make sure no other job is scheduled Jobs.cancel_scheduled_job(:pull_hotlinked_images, post_id: @post.id) # schedule the job - delay = SiteSetting.ninja_edit_window + 1 + delay = SiteSetting.editing_grace_period + 1 Jobs.enqueue_in(delay.seconds.to_i, :pull_hotlinked_images, post_id: @post.id, bypass_bump: bypass_bump) end diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb index cb15c6f217e..e404640cc6c 100644 --- a/lib/post_revisor.rb +++ b/lib/post_revisor.rb @@ -174,7 +174,7 @@ class PostRevisor end def ninja_edit? - @revised_at - @last_version_at <= SiteSetting.ninja_edit_window.to_i + @revised_at - @last_version_at <= SiteSetting.editing_grace_period.to_i end def owner_changed? diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb index 1134278e227..056c5236ad2 100644 --- a/spec/components/cooked_post_processor_spec.rb +++ b/spec/components/cooked_post_processor_spec.rb @@ -402,10 +402,10 @@ describe CookedPostProcessor do before { post.id = 42 } - it "ensures only one job is scheduled right after the ninja_edit_window" do + it "ensures only one job is scheduled right after the editing_grace_period" do Jobs.expects(:cancel_scheduled_job).with(:pull_hotlinked_images, post_id: post.id).once - delay = SiteSetting.ninja_edit_window + 1 + delay = SiteSetting.editing_grace_period + 1 Jobs.expects(:enqueue_in).with(delay.seconds, :pull_hotlinked_images, post_id: post.id, bypass_bump: false).once cpp.pull_hotlinked_images diff --git a/spec/components/post_revisor_spec.rb b/spec/components/post_revisor_spec.rb index efcd03054a4..67e505356e7 100644 --- a/spec/components/post_revisor_spec.rb +++ b/spec/components/post_revisor_spec.rb @@ -74,7 +74,7 @@ describe PostRevisor do describe 'ninja editing' do it 'correctly applies edits' do - SiteSetting.stubs(:ninja_edit_window).returns(1.minute) + SiteSetting.stubs(:editing_grace_period).returns(1.minute) subject.revise!(post.user, { raw: 'updated body' }, revised_at: post.updated_at + 10.seconds) post.reload @@ -87,12 +87,12 @@ describe PostRevisor do end it "doesn't create a new version" do - SiteSetting.stubs(:ninja_edit_window).returns(1.minute) + SiteSetting.stubs(:editing_grace_period).returns(1.minute) # making a revision - subject.revise!(post.user, { raw: 'updated body' }, revised_at: post.updated_at + SiteSetting.ninja_edit_window + 1.seconds) + subject.revise!(post.user, { raw: 'updated body' }, revised_at: post.updated_at + SiteSetting.editing_grace_period + 1.seconds) # "roll back" - subject.revise!(post.user, { raw: 'Hello world' }, revised_at: post.updated_at + SiteSetting.ninja_edit_window + 2.seconds) + subject.revise!(post.user, { raw: 'Hello world' }, revised_at: post.updated_at + SiteSetting.editing_grace_period + 2.seconds) post.reload @@ -107,7 +107,7 @@ describe PostRevisor do let!(:revised_at) { post.updated_at + 2.minutes } before do - SiteSetting.stubs(:ninja_edit_window).returns(1.minute.to_i) + SiteSetting.stubs(:editing_grace_period).returns(1.minute.to_i) subject.revise!(post.user, { raw: 'updated body' }, revised_at: revised_at) post.reload end @@ -313,7 +313,7 @@ describe PostRevisor do context 'second poster posts again quickly' do before do - SiteSetting.stubs(:ninja_edit_window).returns(1.minute.to_i) + SiteSetting.stubs(:editing_grace_period).returns(1.minute.to_i) subject.revise!(changed_by, { raw: 'yet another updated body' }, revised_at: post.updated_at + 10.seconds) post.reload end diff --git a/spec/components/site_settings/yaml_loader_spec.rb b/spec/components/site_settings/yaml_loader_spec.rb index 6fc59b623a3..5477aa9efc3 100644 --- a/spec/components/site_settings/yaml_loader_spec.rb +++ b/spec/components/site_settings/yaml_loader_spec.rb @@ -41,7 +41,7 @@ describe SiteSettings::YamlLoader do it "loads simple settings" do receiver.expects(:setting).with('category1', 'title', 'My Site', {}).once receiver.expects(:setting).with('category1', 'contact_email', 'webmaster@example.com', {}).once - receiver.expects(:setting).with('category2', 'ninja_edit_window', true, {}).once + receiver.expects(:setting).with('category2', 'editing_grace_period', true, {}).once receiver.expects(:setting).with('category3', 'reply_by_email_address', '', {}).once receiver.load_yaml(simple) end diff --git a/spec/fixtures/site_settings/simple.yml b/spec/fixtures/site_settings/simple.yml index e53dc0aaae4..9a36d681d42 100644 --- a/spec/fixtures/site_settings/simple.yml +++ b/spec/fixtures/site_settings/simple.yml @@ -3,7 +3,7 @@ category1: contact_email: 'webmaster@example.com' category2: - ninja_edit_window: true + editing_grace_period: true category3: reply_by_email_address: '' diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb index 8fdf5952af6..9d74f3e7770 100644 --- a/spec/models/category_spec.rb +++ b/spec/models/category_spec.rb @@ -451,7 +451,7 @@ describe Category do before do post = create_post(user: @category.user, category: @category.name) - SiteSetting.stubs(:ninja_edit_window).returns(1.minute.to_i) + SiteSetting.stubs(:editing_grace_period).returns(1.minute.to_i) post.revise(post.user, { raw: 'updated body' }, revised_at: post.updated_at + 2.minutes) Category.update_stats diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb index a85b327f27b..20e0921b5d0 100644 --- a/spec/models/post_spec.rb +++ b/spec/models/post_spec.rb @@ -481,7 +481,7 @@ describe Post do describe 'ninja editing & edit windows' do - before { SiteSetting.stubs(:ninja_edit_window).returns(1.minute.to_i) } + before { SiteSetting.stubs(:editing_grace_period).returns(1.minute.to_i) } it 'works' do revised_at = post.updated_at + 2.minutes @@ -548,7 +548,7 @@ describe Post do context 'second poster posts again quickly' do it 'is a ninja edit, because the second poster posted again quickly' do - SiteSetting.expects(:ninja_edit_window).returns(1.minute.to_i) + SiteSetting.expects(:editing_grace_period).returns(1.minute.to_i) post.revise(changed_by, { raw: 'yet another updated body' }, revised_at: post.updated_at + 10.seconds) post.reload diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb index e9b2b29b912..2f6d42e5e80 100644 --- a/spec/models/topic_spec.rb +++ b/spec/models/topic_spec.rb @@ -464,7 +464,7 @@ describe Topic do it "doesn't bump the topic on an edit to the last post that doesn't result in a new version" do expect { - SiteSetting.expects(:ninja_edit_window).returns(5.minutes) + SiteSetting.expects(:editing_grace_period).returns(5.minutes) @last_post.revise(@last_post.user, { raw: 'updated contents' }, revised_at: @last_post.created_at + 10.seconds) @topic.reload }.not_to change(@topic, :bumped_at) diff --git a/spec/services/badge_granter_spec.rb b/spec/services/badge_granter_spec.rb index 8eec7f2b16b..e81ec369223 100644 --- a/spec/services/badge_granter_spec.rb +++ b/spec/services/badge_granter_spec.rb @@ -188,7 +188,7 @@ describe BadgeGranter do end it "grants first edit" do - SiteSetting.ninja_edit_window = 0 + SiteSetting.editing_grace_period = 0 post = create_post user = post.user