From 3bdbd285324ea9516756e5a827d581deb10e8461 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 10 Feb 2014 12:02:28 -0500 Subject: [PATCH 01/10] removing console log in search template --- public/src/forum/search.js | 1 - 1 file changed, 1 deletion(-) diff --git a/public/src/forum/search.js b/public/src/forum/search.js index 9ae2543b28..08bad46056 100644 --- a/public/src/forum/search.js +++ b/public/src/forum/search.js @@ -3,7 +3,6 @@ define(function() { Search.init = function() { var searchQuery = $('#topic-results').attr('data-search-query'); -console.log(searchQuery); $('.search-result-text').children().each(function() { var text = $(this).html(); var regex = new RegExp(searchQuery, 'gi'); From b6e96541e7e5ea0ac2e8c0d02436f58d4ad1517b Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 10 Feb 2014 12:41:29 -0500 Subject: [PATCH 02/10] first pass, #981 --- public/language/en_GB/notifications.json | 3 ++ public/language/en_GB/topic.json | 17 +++--- public/src/forum/topic.js | 68 ++++++++++++++---------- public/src/modules/notifications.js | 8 ++- public/templates/header.tpl | 2 +- public/templates/search.tpl | 10 ++-- public/templates/topic.tpl | 6 +-- 7 files changed, 68 insertions(+), 46 deletions(-) diff --git a/public/language/en_GB/notifications.json b/public/language/en_GB/notifications.json index a66ac79b89..6ea4bf837b 100644 --- a/public/language/en_GB/notifications.json +++ b/public/language/en_GB/notifications.json @@ -1,5 +1,8 @@ { "title": "Notifications", + "no_notifs": "You have no notifications", + "see_all": "See all Notifications", + "back_to_home": "Back to NodeBB", "outgoing_link": "Outgoing Link", "outgoing_link_message": "You are now leaving", diff --git a/public/language/en_GB/topic.json b/public/language/en_GB/topic.json index e1d1651e0d..d398539a27 100644 --- a/public/language/en_GB/topic.json +++ b/public/language/en_GB/topic.json @@ -3,6 +3,7 @@ "topics": "Topics", "no_topics_found": "No topics found!", + "no_posts_found": "No posts found!", "profile": "Profile", "posted_by": "Posted by", @@ -20,15 +21,19 @@ "tools": "Tools", "flag": "Flag", - "flag_title":"Flag this post for moderation", + "flag_title": "Flag this post for moderation", + "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "thread_tools.title": "Thread Tools", "thread_tools.markAsUnreadForAll": "Mark Unread", - "thread_tools.pin": "Pin Thread", - "thread_tools.lock": "Lock Thread", - "thread_tools.move": "Move Thread", - "thread_tools.fork": "Fork Thread", - "thread_tools.delete": "Delete Thread", + "thread_tools.pin": "Pin", + "thread_tools.unpin": "Unpin", + "thread_tools.lock": "Lock", + "thread_tools.unlock": "Unlock", + "thread_tools.move": "Move", + "thread_tools.fork": "Fork", + "thread_tools.delete": "Delete", + "thread_tools.restore": "Restore", "load_categories": "Loading Categories", "disabled_categories_note": "Disabled Categories are greyed out", diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js index a869e6fd1a..91fde9d7b4 100644 --- a/public/src/forum/topic.js +++ b/public/src/forum/topic.js @@ -913,7 +913,9 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { x; if (locked === true) { - lockThreadEl.html(' Unlock Thread'); + translator.translate(' [[topic:thread_tools.unlock]] [[topic:topic]]', function(translated) { + lockThreadEl.html(translated); + }); threadReplyBtn.attr('disabled', true); threadReplyBtn.html('Locked '); for (x = 0; x < numPosts; x++) { @@ -935,7 +937,9 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { thread_state.locked = '1'; } else { - lockThreadEl.html(' Lock Thread'); + translator.translate(' [[topic:thread_tools.lock]] [[topic:topic]]', function(translated) { + lockThreadEl.html(translated); + }); threadReplyBtn.attr('disabled', false); threadReplyBtn.html('Reply'); for (x = 0; x < numPosts; x++) { @@ -967,7 +971,9 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { deleteNotice = document.getElementById('thread-deleted') || document.createElement('div'); if (deleted) { - deleteTextEl.html(' Restore Thread'); + translator.translate(' [[topic:thread_tools.restore]] [[topic:topic]]', function(translated) { + deleteTextEl.html(translated); + }); threadEl.addClass('deleted'); // Spawn a 'deleted' notice at the top of the page @@ -978,7 +984,9 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { thread_state.deleted = '1'; } else { - deleteTextEl.html(' Delete Thread'); + translator.translate(' [[topic:thread_tools.delete]] [[topic:topic]]', function(translated) { + deleteTextEl.html(translated); + }); threadEl.removeClass('deleted'); deleteNotice.parentNode.removeChild(deleteNotice); @@ -989,33 +997,35 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { function set_pinned_state(pinned, alert) { var pinEl = $('.pin_thread'); - if (pinned) { - pinEl.html(' Unpin Thread'); - if (alert) { - app.alert({ - 'alert_id': 'thread_pin', - type: 'success', - title: 'Thread Pinned', - message: 'Thread has been successfully pinned', - timeout: 5000 - }); - } + translator.translate(' [[topic:thread_tools.' + (pinned ? 'unpin' : 'pin') + ']] [[topic:topic]]', function(translated) { + if (pinned) { + pinEl.html(translated); + if (alert) { + app.alert({ + 'alert_id': 'thread_pin', + type: 'success', + title: 'Thread Pinned', + message: 'Thread has been successfully pinned', + timeout: 5000 + }); + } - thread_state.pinned = '1'; - } else { - pinEl.html(' Pin Thread'); - if (alert) { - app.alert({ - 'alert_id': 'thread_pin', - type: 'success', - title: 'Thread Unpinned', - message: 'Thread has been successfully unpinned', - timeout: 5000 - }); - } + thread_state.pinned = '1'; + } else { + pinEl.html(translated); + if (alert) { + app.alert({ + 'alert_id': 'thread_pin', + type: 'success', + title: 'Thread Unpinned', + message: 'Thread has been successfully unpinned', + timeout: 5000 + }); + } - thread_state.pinned = '0'; - } + thread_state.pinned = '0'; + } + }); } function toggle_post_delete_state(pid) { diff --git a/public/src/modules/notifications.js b/public/src/modules/notifications.js index b209ac22c3..13485a47c6 100644 --- a/public/src/modules/notifications.js +++ b/public/src/modules/notifications.js @@ -29,10 +29,14 @@ define(function() { } } else { - notifList.append($('
  • You have no notifications
    • ')); + translator.translate('
  • [[notifications:no_notifs]]
    • ', function(translated) { + notifList.append($(translated)); + }); } - notifList.append($('
  • See all Notifications
    • ')); + translator.translate('
  • [[notifications:see_all]]
    • ', function(translated) { + notifList.append($(translated)); + }); updateNotifCount(data.unread.length); diff --git a/public/templates/header.tpl b/public/templates/header.tpl index 0ad5f97d90..694823c691 100644 --- a/public/templates/header.tpl +++ b/public/templates/header.tpl @@ -174,7 +174,7 @@ @@ -57,12 +57,12 @@
    -

    Posts

    +

    [[topic:posts]]

    {post_matches} result(s) matching "{search_query}" -
    No posts found!
    +
    [[tropic:no_posts_found]]
    diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl index c68438c48b..d56bac87d3 100644 --- a/public/templates/topic.tpl +++ b/public/templates/topic.tpl @@ -178,13 +178,13 @@
    From 8f369d9dbc52fc52baccd4d4de4139bf88155a40 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 10 Feb 2014 12:47:01 -0500 Subject: [PATCH 03/10] added 'topic' back to string --- public/language/en_GB/topic.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/public/language/en_GB/topic.json b/public/language/en_GB/topic.json index d398539a27..12778f9a4e 100644 --- a/public/language/en_GB/topic.json +++ b/public/language/en_GB/topic.json @@ -26,14 +26,14 @@ "thread_tools.title": "Thread Tools", "thread_tools.markAsUnreadForAll": "Mark Unread", - "thread_tools.pin": "Pin", - "thread_tools.unpin": "Unpin", - "thread_tools.lock": "Lock", - "thread_tools.unlock": "Unlock", - "thread_tools.move": "Move", - "thread_tools.fork": "Fork", - "thread_tools.delete": "Delete", - "thread_tools.restore": "Restore", + "thread_tools.pin": "Pin Topic", + "thread_tools.unpin": "Unpin Topic", + "thread_tools.lock": "Lock Topic", + "thread_tools.unlock": "Unlock Topic", + "thread_tools.move": "Move Topic", + "thread_tools.fork": "Fork Topic", + "thread_tools.delete": "Delete Topic", + "thread_tools.restore": "Restore Topic", "load_categories": "Loading Categories", "disabled_categories_note": "Disabled Categories are greyed out", From 5f8bfaa8711adb37bee6fd411013f5340c2dd698 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 10 Feb 2014 12:51:52 -0500 Subject: [PATCH 04/10] reverting some fixes --- public/language/ar/topic.json | 9 +++++++++ public/src/forum/topic.js | 10 +++++----- public/templates/topic.tpl | 6 +++--- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/public/language/ar/topic.json b/public/language/ar/topic.json index 0f8a291542..a022f2987d 100644 --- a/public/language/ar/topic.json +++ b/public/language/ar/topic.json @@ -2,6 +2,7 @@ "topic": "موضوع", "topics": "مواضيع", "no_topics_found": "لا توجد مواضيع !", + "no_posts_found": "No posts found!", "profile": "ملف", "posted_by": "Posted by", "chat": "دردشة", @@ -18,13 +19,17 @@ "tools": "أدوات", "flag": "Flag", "flag_title": "Flag this post for moderation", + "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "thread_tools.title": "أدوات الموضوع", "thread_tools.markAsUnreadForAll": "علم غير مقروء", "thread_tools.pin": "علق الموضوع", + "thread_tools.unpin": "Unpin Topic", "thread_tools.lock": "قفل الموضوع", + "thread_tools.unlock": "Unlock Topic", "thread_tools.move": "نقل الموضوع", "thread_tools.fork": "تفرع الموضوع", "thread_tools.delete": "حذف الموضوع", + "thread_tools.restore": "Restore Topic", "load_categories": "تحميل الفئات", "disabled_categories_note": "الفئات المجلدة رمادية", "confirm_move": "انقل", @@ -34,6 +39,10 @@ "favourites.not_logged_in.title": "ليس موجود حالياً", "favourites.not_logged_in.message": "الرجاء تسجيل الدخول لتفضل هذا الرد", "favourites.has_no_favourites": "ليس لديك أي ردود مفضلة. فضل بعد الردود لرؤيتهم هنا", + "vote.not_logged_in.title": "Not Logged In", + "vote.not_logged_in.message": "Please log in in order to vote", + "vote.cant_vote_self.title": "Invalid Vote", + "vote.cant_vote_self.message": "You cannot vote for your own post", "loading_more_posts": "تحميل المزيد من المشاركات", "move_topic": "نقل الموضوع", "move_post": "نقل الرد", diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js index 91fde9d7b4..3910ee9bc9 100644 --- a/public/src/forum/topic.js +++ b/public/src/forum/topic.js @@ -913,7 +913,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { x; if (locked === true) { - translator.translate(' [[topic:thread_tools.unlock]] [[topic:topic]]', function(translated) { + translator.translate(' [[topic:thread_tools.unlock]]', function(translated) { lockThreadEl.html(translated); }); threadReplyBtn.attr('disabled', true); @@ -937,7 +937,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { thread_state.locked = '1'; } else { - translator.translate(' [[topic:thread_tools.lock]] [[topic:topic]]', function(translated) { + translator.translate(' [[topic:thread_tools.lock]]', function(translated) { lockThreadEl.html(translated); }); threadReplyBtn.attr('disabled', false); @@ -971,7 +971,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { deleteNotice = document.getElementById('thread-deleted') || document.createElement('div'); if (deleted) { - translator.translate(' [[topic:thread_tools.restore]] [[topic:topic]]', function(translated) { + translator.translate(' [[topic:thread_tools.restore]]', function(translated) { deleteTextEl.html(translated); }); threadEl.addClass('deleted'); @@ -984,7 +984,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { thread_state.deleted = '1'; } else { - translator.translate(' [[topic:thread_tools.delete]] [[topic:topic]]', function(translated) { + translator.translate(' [[topic:thread_tools.delete]]', function(translated) { deleteTextEl.html(translated); }); threadEl.removeClass('deleted'); @@ -997,7 +997,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { function set_pinned_state(pinned, alert) { var pinEl = $('.pin_thread'); - translator.translate(' [[topic:thread_tools.' + (pinned ? 'unpin' : 'pin') + ']] [[topic:topic]]', function(translated) { + translator.translate(' [[topic:thread_tools.' + (pinned ? 'unpin' : 'pin') + ']]', function(translated) { if (pinned) { pinEl.html(translated); if (alert) { diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl index d56bac87d3..c68438c48b 100644 --- a/public/templates/topic.tpl +++ b/public/templates/topic.tpl @@ -178,13 +178,13 @@ From e9852a804c475e679eb0ab6ab74318742451c0eb Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 10 Feb 2014 13:00:20 -0500 Subject: [PATCH 05/10] language updates --- public/language/ar/notifications.json | 2 ++ public/language/ar/recent.json | 3 ++- public/language/ar/user.json | 2 ++ public/language/cs/global.json | 22 +++++++++---------- public/language/cs/notifications.json | 2 ++ public/language/cs/recent.json | 5 +++-- public/language/cs/register.json | 4 ++-- public/language/cs/topic.json | 27 ++++++++++++++++-------- public/language/cs/user.json | 6 ++++-- public/language/de/notifications.json | 2 ++ public/language/de/recent.json | 3 ++- public/language/de/topic.json | 19 ++++++++++++----- public/language/de/user.json | 2 ++ public/language/es/global.json | 14 ++++++------ public/language/es/notifications.json | 2 ++ public/language/es/recent.json | 3 ++- public/language/es/register.json | 4 ++-- public/language/es/topic.json | 21 ++++++++++++------ public/language/es/user.json | 10 +++++---- public/language/fi/notifications.json | 2 ++ public/language/fi/recent.json | 3 ++- public/language/fi/topic.json | 19 ++++++++++++----- public/language/fi/user.json | 2 ++ public/language/fr/notifications.json | 2 ++ public/language/fr/recent.json | 3 ++- public/language/fr/topic.json | 15 ++++++++----- public/language/he/notifications.json | 2 ++ public/language/he/recent.json | 3 ++- public/language/he/topic.json | 15 ++++++++----- public/language/hu/notifications.json | 2 ++ public/language/hu/recent.json | 3 ++- public/language/hu/topic.json | 19 ++++++++++++----- public/language/hu/user.json | 2 ++ public/language/it/notifications.json | 2 ++ public/language/it/recent.json | 3 ++- public/language/it/topic.json | 19 ++++++++++++----- public/language/it/user.json | 2 ++ public/language/nb/notifications.json | 2 ++ public/language/nb/recent.json | 3 ++- public/language/nb/topic.json | 19 ++++++++++++----- public/language/nb/user.json | 2 ++ public/language/pt_BR/notifications.json | 2 ++ public/language/pt_BR/recent.json | 3 ++- public/language/pt_BR/topic.json | 19 ++++++++++++----- public/language/pt_BR/user.json | 2 ++ public/language/ru/notifications.json | 2 ++ public/language/ru/recent.json | 3 ++- public/language/ru/topic.json | 15 ++++++++----- public/language/sk/notifications.json | 2 ++ public/language/sk/recent.json | 3 ++- public/language/sk/topic.json | 19 ++++++++++++----- public/language/sk/user.json | 2 ++ public/language/sv/notifications.json | 2 ++ public/language/sv/recent.json | 3 ++- public/language/sv/topic.json | 19 ++++++++++++----- public/language/sv/user.json | 2 ++ public/language/tr/notifications.json | 2 ++ public/language/tr/recent.json | 3 ++- public/language/tr/topic.json | 19 ++++++++++++----- public/language/tr/user.json | 2 ++ public/language/zh_CN/notifications.json | 2 ++ public/language/zh_CN/recent.json | 3 ++- public/language/zh_CN/topic.json | 19 ++++++++++++----- public/language/zh_CN/user.json | 2 ++ public/language/zh_TW/notifications.json | 2 ++ public/language/zh_TW/recent.json | 3 ++- public/language/zh_TW/topic.json | 19 ++++++++++++----- public/language/zh_TW/user.json | 2 ++ 68 files changed, 342 insertions(+), 131 deletions(-) diff --git a/public/language/ar/notifications.json b/public/language/ar/notifications.json index 3a5ae51e52..5e01d3f5a8 100644 --- a/public/language/ar/notifications.json +++ b/public/language/ar/notifications.json @@ -1,5 +1,7 @@ { "title": "إعلام", + "no_notifs": "You have no notifications", + "see_all": "See all Notifications", "back_to_home": "العودة إلى NodeBB", "outgoing_link": "رابط خارجي", "outgoing_link_message": "أنت الأن ترحل", diff --git a/public/language/ar/recent.json b/public/language/ar/recent.json index ab5179e0c7..88d81f171d 100644 --- a/public/language/ar/recent.json +++ b/public/language/ar/recent.json @@ -2,5 +2,6 @@ "title": "Recent", "day": "يوم", "week": "أسبوع", - "month": "شهر" + "month": "شهر", + "no_recent_topics": "There are no recent topics." } \ No newline at end of file diff --git a/public/language/ar/user.json b/public/language/ar/user.json index af603c89d9..216552cc19 100644 --- a/public/language/ar/user.json +++ b/public/language/ar/user.json @@ -9,6 +9,7 @@ "age": "عمر", "joined": "تاريخ التسجيل", "lastonline": "تاريخ أخر دخول", + "profile": "Profile", "profile_views": "مشاهد الملف", "reputation": "سمعة", "posts": "ردود", @@ -32,6 +33,7 @@ "show_email": "أظهر بريدي الإلكتروني", "has_no_follower": "هذا المستخدم ليس لديه أي أتباع :(", "follows_no_one": "هذا المستخدم لا يتبع أحد :(", + "has_no_posts": "This user didn't post anything yet.", "email_hidden": "البريد الإلكتروني مخفي", "hidden": "مخفي" } \ No newline at end of file diff --git a/public/language/cs/global.json b/public/language/cs/global.json index 5e230e9516..88feb8c359 100644 --- a/public/language/cs/global.json +++ b/public/language/cs/global.json @@ -18,7 +18,7 @@ "header.admin": "Administrace", "header.recent": "Aktuality", "header.unread": "Nepřečtené", - "header.popular": "Popular", + "header.popular": "Populární", "header.users": "Uživatelé", "header.chats": "Chats", "header.notifications": "Notifications", @@ -31,22 +31,22 @@ "motd.fork": "Fork", "motd.like": "To se mi líbí", "motd.follow": "Sledovat", - "previouspage": "Previous Page", - "nextpage": "Next Page", + "previouspage": "Předchozí stránka", + "nextpage": "Další stránka", "alert.success": "Success", "alert.error": "Error", "alert.banned": "Banned", "alert.banned.message": "You are banned you will be logged out!", "alert.unfollow": "You are no longer following %1!", "alert.follow": "You are now following %1!", - "posts": "Posts", - "views": "Views", - "posted": "posted", - "in": "in", - "recentposts": "Recent Posts", + "posts": "Příspěvky", + "views": "Zobrazení", + "posted": "odesláno", + "in": "v", + "recentposts": "Nedávné příspěvky", "online": "Online", - "away": "Away", - "dnd": "Do not Disturb", - "invisible": "Invisible", + "away": "Pryč", + "dnd": "Nerušit", + "invisible": "Neviditelný", "offline": "Offline" } \ No newline at end of file diff --git a/public/language/cs/notifications.json b/public/language/cs/notifications.json index 2165b85aab..f240769297 100644 --- a/public/language/cs/notifications.json +++ b/public/language/cs/notifications.json @@ -1,5 +1,7 @@ { "title": "Upozornění", + "no_notifs": "You have no notifications", + "see_all": "See all Notifications", "back_to_home": "Zpět na úvodní stránku", "outgoing_link": "Odkaz mimo fórum", "outgoing_link_message": "Nyní opouštíte fórum", diff --git a/public/language/cs/recent.json b/public/language/cs/recent.json index b69b29156a..40e7f096e4 100644 --- a/public/language/cs/recent.json +++ b/public/language/cs/recent.json @@ -1,6 +1,7 @@ { - "title": "Recent", + "title": "Nedávné", "day": "Den", "week": "Týden", - "month": "Měsíc" + "month": "Měsíc", + "no_recent_topics": "There are no recent topics." } \ No newline at end of file diff --git a/public/language/cs/register.json b/public/language/cs/register.json index d234623758..1e7b9fc301 100644 --- a/public/language/cs/register.json +++ b/public/language/cs/register.json @@ -13,6 +13,6 @@ "confirm_password_placeholder": "Potvrďte heslo", "register_now_button": "Zaregistrovat se", "alternative_registration": "Jiný způsob registrace", - "terms_of_use": "Terms of Use", - "agree_to_terms_of_use": "I agree to the Terms of Use" + "terms_of_use": "Podmínky", + "agree_to_terms_of_use": "Souhlasím s Podmínkami" } \ No newline at end of file diff --git a/public/language/cs/topic.json b/public/language/cs/topic.json index 0ab2f0adea..bd1f04645b 100644 --- a/public/language/cs/topic.json +++ b/public/language/cs/topic.json @@ -2,8 +2,9 @@ "topic": "Téma", "topics": "Témata", "no_topics_found": "Nebyla nalezena žádná témata!", + "no_posts_found": "No posts found!", "profile": "Profil", - "posted_by": "Posted by", + "posted_by": "Odeslal", "chat": "Chat", "notify_me": "Sledovat toto téma", "quote": "Citovat", @@ -14,17 +15,21 @@ "fork": "Rozdělit", "banned": "banned", "link": "Odkaz", - "share": "Share", - "tools": "Tools", + "share": "Sdílet", + "tools": "Nástroje", "flag": "Flag", "flag_title": "Flag this post for moderation", + "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "thread_tools.title": "Nástroje", - "thread_tools.markAsUnreadForAll": "Mark Unread", - "thread_tools.pin": "Zvýraznit vlákno", - "thread_tools.lock": "Uzamknout vlákno", - "thread_tools.move": "Přesunout vlákno", - "thread_tools.fork": "Rozdělit vlákno", - "thread_tools.delete": "Smazat vlákno", + "thread_tools.markAsUnreadForAll": "Označit jako nepřečtené", + "thread_tools.pin": "Pin Topic", + "thread_tools.unpin": "Unpin Topic", + "thread_tools.lock": "Lock Topic", + "thread_tools.unlock": "Unlock Topic", + "thread_tools.move": "Move Topic", + "thread_tools.fork": "Fork Topic", + "thread_tools.delete": "Delete Topic", + "thread_tools.restore": "Restore Topic", "load_categories": "Načítání kategorií", "disabled_categories_note": "Vypnuté (disabled) kategorie jsou šedé.", "confirm_move": "Přesunout", @@ -34,6 +39,10 @@ "favourites.not_logged_in.title": "Přihlaste se!", "favourites.not_logged_in.message": "Pro oblíbení příspěvku se musíte přihlásit.", "favourites.has_no_favourites": "Nemáte žádné oblíbené příspěvky, přidejte některý příspěvek k oblíbeným a uvidíte ho zde!", + "vote.not_logged_in.title": "Not Logged In", + "vote.not_logged_in.message": "Please log in in order to vote", + "vote.cant_vote_self.title": "Invalid Vote", + "vote.cant_vote_self.message": "You cannot vote for your own post", "loading_more_posts": "Načítání více příspěvků", "move_topic": "Přesunout téma", "move_post": "Přesunout příspěvek", diff --git a/public/language/cs/user.json b/public/language/cs/user.json index 46df85fe57..efeac84d48 100644 --- a/public/language/cs/user.json +++ b/public/language/cs/user.json @@ -9,10 +9,11 @@ "age": "Věk", "joined": "Registrován", "lastonline": "Naposledy online", + "profile": "Profile", "profile_views": "Zobrazení profilu", "reputation": "Reputace", "posts": "Příspěvky", - "favourites": "Favourites", + "favourites": "Oblíbené", "followers": "Sledují ho", "following": "Sleduje", "signature": "Podpis", @@ -28,10 +29,11 @@ "upload_picture": "Nahrát obrázek", "upload_a_picture": "Nahrát obrázek", "image_spec": "Můžete nahrávat poze obrázky ve formátu PNG, JPG, nebo GIF o velikosti menší než 256kb.", - "settings": "Settings", + "settings": "Nastavení", "show_email": "Zobrazovat můj email v profilu", "has_no_follower": "Tohoto uživatele nikdo nesleduje :(", "follows_no_one": "Tento uživatel nikoho nesleduje :(", + "has_no_posts": "This user didn't post anything yet.", "email_hidden": "Skrytý email", "hidden": "skrytý" } \ No newline at end of file diff --git a/public/language/de/notifications.json b/public/language/de/notifications.json index f74984b361..d3927f08bd 100644 --- a/public/language/de/notifications.json +++ b/public/language/de/notifications.json @@ -1,5 +1,7 @@ { "title": "Benachrichtigungen", + "no_notifs": "You have no notifications", + "see_all": "See all Notifications", "back_to_home": "Zurück zur Startseite", "outgoing_link": "Externer Link", "outgoing_link_message": "Du verlässt nun", diff --git a/public/language/de/recent.json b/public/language/de/recent.json index 84dbb34920..33ec31df44 100644 --- a/public/language/de/recent.json +++ b/public/language/de/recent.json @@ -2,5 +2,6 @@ "title": "Aktuell", "day": "Tag", "week": "Woche", - "month": "Monat" + "month": "Monat", + "no_recent_topics": "There are no recent topics." } \ No newline at end of file diff --git a/public/language/de/topic.json b/public/language/de/topic.json index 26ac48199c..161f3fe3c8 100644 --- a/public/language/de/topic.json +++ b/public/language/de/topic.json @@ -2,6 +2,7 @@ "topic": "Thema", "topics": "Themen", "no_topics_found": "Keine passende Themen gefunden.", + "no_posts_found": "No posts found!", "profile": "Profil", "posted_by": "Geposted von", "chat": "Chat", @@ -18,13 +19,17 @@ "tools": "Tools", "flag": "Markieren", "flag_title": "Diesen Beitrag zur Moderation markieren", + "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "thread_tools.title": "Thread Tools", "thread_tools.markAsUnreadForAll": "Als ungelesen markieren", - "thread_tools.pin": "Thread pinnen", - "thread_tools.lock": "Thread sperren", - "thread_tools.move": "Thread verschieben", - "thread_tools.fork": "Thread aufspalten", - "thread_tools.delete": "Thread löschen", + "thread_tools.pin": "Pin Topic", + "thread_tools.unpin": "Unpin Topic", + "thread_tools.lock": "Lock Topic", + "thread_tools.unlock": "Unlock Topic", + "thread_tools.move": "Move Topic", + "thread_tools.fork": "Fork Topic", + "thread_tools.delete": "Delete Topic", + "thread_tools.restore": "Restore Topic", "load_categories": "Kategorien laden", "disabled_categories_note": "Deaktivierte Kategorien sind ausgegraut.", "confirm_move": "verschieben", @@ -34,6 +39,10 @@ "favourites.not_logged_in.title": "Nicht eingeloggt!", "favourites.not_logged_in.message": "Bitte logge dich ein, um diesen Beitrag favorisieren zu können.", "favourites.has_no_favourites": "Du hast noch keine Favoriten.", + "vote.not_logged_in.title": "Not Logged In", + "vote.not_logged_in.message": "Please log in in order to vote", + "vote.cant_vote_self.title": "Invalid Vote", + "vote.cant_vote_self.message": "You cannot vote for your own post", "loading_more_posts": "Lade Mehr Posts", "move_topic": "Thema verschieben", "move_post": "Beitrag verschieben", diff --git a/public/language/de/user.json b/public/language/de/user.json index 252638b1ee..66a7c4091c 100644 --- a/public/language/de/user.json +++ b/public/language/de/user.json @@ -9,6 +9,7 @@ "age": "Alter", "joined": "Beigetreten", "lastonline": "Zuletzt online", + "profile": "Profile", "profile_views": "Profilaufrufe", "reputation": "Reputation", "posts": "Posts", @@ -32,6 +33,7 @@ "show_email": "Zeige meine E-Mail Adresse an.", "has_no_follower": "Dieser User hat noch keine Follower.", "follows_no_one": "Dieser User folgt noch niemanden.", + "has_no_posts": "This user didn't post anything yet.", "email_hidden": "E-Mail Adresse versteckt", "hidden": "versteckt" } \ No newline at end of file diff --git a/public/language/es/global.json b/public/language/es/global.json index be3abb0b52..972475dd09 100644 --- a/public/language/es/global.json +++ b/public/language/es/global.json @@ -41,12 +41,12 @@ "alert.follow": "Estas siguiendo a %1!", "posts": "Posts", "views": "Visitas", - "posted": "posted", - "in": "in", - "recentposts": "Recent Posts", - "online": "Online", - "away": "Away", - "dnd": "Do not Disturb", + "posted": "publicado", + "in": "en", + "recentposts": "Posteos Recientes", + "online": "Conectado", + "away": "No disponible", + "dnd": "No molestar", "invisible": "Invisible", - "offline": "Offline" + "offline": "Desconectado" } \ No newline at end of file diff --git a/public/language/es/notifications.json b/public/language/es/notifications.json index 76a253e393..16d351704f 100644 --- a/public/language/es/notifications.json +++ b/public/language/es/notifications.json @@ -1,5 +1,7 @@ { "title": "Notificaciones", + "no_notifs": "You have no notifications", + "see_all": "See all Notifications", "back_to_home": "Volver al Inicio", "outgoing_link": "Link Externo", "outgoing_link_message": "Estas saliendo del sitio", diff --git a/public/language/es/recent.json b/public/language/es/recent.json index 5f7458f788..f56812ca10 100644 --- a/public/language/es/recent.json +++ b/public/language/es/recent.json @@ -2,5 +2,6 @@ "title": "Reciente", "day": "Día", "week": "Semana", - "month": "Mes" + "month": "Mes", + "no_recent_topics": "There are no recent topics." } \ No newline at end of file diff --git a/public/language/es/register.json b/public/language/es/register.json index 813db113c7..0e276d70c7 100644 --- a/public/language/es/register.json +++ b/public/language/es/register.json @@ -13,6 +13,6 @@ "confirm_password_placeholder": "Confirmar Contraseña", "register_now_button": "Registrarme ahora", "alternative_registration": "Otros metodos interesantes para registrarse", - "terms_of_use": "Terms of Use", - "agree_to_terms_of_use": "I agree to the Terms of Use" + "terms_of_use": "Términos y Condiciones de uso", + "agree_to_terms_of_use": "Acepto los Terminos y condiciones de uso" } \ No newline at end of file diff --git a/public/language/es/topic.json b/public/language/es/topic.json index fd2162dc38..be98dac70b 100644 --- a/public/language/es/topic.json +++ b/public/language/es/topic.json @@ -2,8 +2,9 @@ "topic": "Tema", "topics": "Temas", "no_topics_found": "No se encontraron temas!", + "no_posts_found": "No posts found!", "profile": "Perfil", - "posted_by": "Posted by", + "posted_by": "Publicado por", "chat": "Chat", "notify_me": "Seras notificado cuando haya nuevas respuestas en este tema", "quote": "Citar", @@ -18,13 +19,17 @@ "tools": "Herramientas", "flag": "Reportar", "flag_title": "Reportar este post a los moderadores", + "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "thread_tools.title": "Herramientas del Tema", "thread_tools.markAsUnreadForAll": "Marcar como no leido", - "thread_tools.pin": "Poner Sticky", - "thread_tools.lock": "Cerrar Tema", - "thread_tools.move": "Mover Tema", - "thread_tools.fork": "Forkear Tema", - "thread_tools.delete": "Borrar Tema", + "thread_tools.pin": "Pin Topic", + "thread_tools.unpin": "Unpin Topic", + "thread_tools.lock": "Lock Topic", + "thread_tools.unlock": "Unlock Topic", + "thread_tools.move": "Move Topic", + "thread_tools.fork": "Fork Topic", + "thread_tools.delete": "Delete Topic", + "thread_tools.restore": "Restore Topic", "load_categories": "Cargando Categorias", "disabled_categories_note": "Las categorías deshabilidas estan en gris", "confirm_move": "Mover", @@ -34,6 +39,10 @@ "favourites.not_logged_in.title": "No estas conectado :(", "favourites.not_logged_in.message": "Por favor, conectate para agregar a favorito este post.", "favourites.has_no_favourites": "No tienes favoritos, puedes agregar alguno y volver a verlos aqui!", + "vote.not_logged_in.title": "Not Logged In", + "vote.not_logged_in.message": "Please log in in order to vote", + "vote.cant_vote_self.title": "Invalid Vote", + "vote.cant_vote_self.message": "You cannot vote for your own post", "loading_more_posts": "Cargando más posts", "move_topic": "Mover Tema", "move_post": "Mover post", diff --git a/public/language/es/user.json b/public/language/es/user.json index d356cbe5ea..ce05b73733 100644 --- a/public/language/es/user.json +++ b/public/language/es/user.json @@ -1,18 +1,19 @@ { "banned": "Banneado", "offline": "Desconectado", - "username": "Nombre de Usuario", + "username": "Usuario", "email": "Email", - "fullname": "Nombre Completo", + "fullname": "Nombre", "website": "Website", "location": "Ubicación", "age": "Edad", "joined": "Registro", "lastonline": "Última vez online", + "profile": "Profile", "profile_views": "Visitas en su perfil", "reputation": "Reputación", "posts": "Posts", - "favourites": "Favourites", + "favourites": "Favoritos", "followers": "Seguidores", "following": "Siguiendo", "signature": "Firma", @@ -28,10 +29,11 @@ "upload_picture": "Cargar foto", "upload_a_picture": "Cargar una foto", "image_spec": "Solo puedes usar PNG, JPG, o GIF hasta 256kb.", - "settings": "Settings", + "settings": "Opciones", "show_email": "Mostrar mi Email", "has_no_follower": "Este miembro no tiene seguidores :(", "follows_no_one": "Este miembro no sigue a nadie, que pena :(", + "has_no_posts": "This user didn't post anything yet.", "email_hidden": "Email Oculto", "hidden": "oculto" } \ No newline at end of file diff --git a/public/language/fi/notifications.json b/public/language/fi/notifications.json index 73cb1f1bea..e6ac937056 100644 --- a/public/language/fi/notifications.json +++ b/public/language/fi/notifications.json @@ -1,5 +1,7 @@ { "title": "Ilmoitukset", + "no_notifs": "You have no notifications", + "see_all": "See all Notifications", "back_to_home": "Takaisin NodeBB:n", "outgoing_link": "Ulkopuolinen linkki", "outgoing_link_message": "Olet nyt poistumassa", diff --git a/public/language/fi/recent.json b/public/language/fi/recent.json index 2942868a7f..314fadb2e1 100644 --- a/public/language/fi/recent.json +++ b/public/language/fi/recent.json @@ -2,5 +2,6 @@ "title": "Recent", "day": "Päivä", "week": "Viikko", - "month": "Kuukausi" + "month": "Kuukausi", + "no_recent_topics": "There are no recent topics." } \ No newline at end of file diff --git a/public/language/fi/topic.json b/public/language/fi/topic.json index 3eb2920271..f361b15685 100644 --- a/public/language/fi/topic.json +++ b/public/language/fi/topic.json @@ -2,6 +2,7 @@ "topic": "Keskustelu", "topics": "Keskustelut", "no_topics_found": "Keskusteluja ei löytynyt!", + "no_posts_found": "No posts found!", "profile": "Profiili", "posted_by": "Posted by", "chat": "Juttele", @@ -18,13 +19,17 @@ "tools": "Työkalut", "flag": "Flag", "flag_title": "Flag this post for moderation", + "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "thread_tools.title": "Ketjun työkalut", "thread_tools.markAsUnreadForAll": "Merkitse luetuiksi", - "thread_tools.pin": "Tee ketjusta pysyvä", - "thread_tools.lock": "Lukitse ketju", - "thread_tools.move": "Siirrä ketju", - "thread_tools.fork": "Haaroita ketju", - "thread_tools.delete": "Poista ketju", + "thread_tools.pin": "Pin Topic", + "thread_tools.unpin": "Unpin Topic", + "thread_tools.lock": "Lock Topic", + "thread_tools.unlock": "Unlock Topic", + "thread_tools.move": "Move Topic", + "thread_tools.fork": "Fork Topic", + "thread_tools.delete": "Delete Topic", + "thread_tools.restore": "Restore Topic", "load_categories": "Ladataan aihealueita", "disabled_categories_note": "Käytöstä poistetut aihealueetta ovat harmaina", "confirm_move": "Siirrä", @@ -34,6 +39,10 @@ "favourites.not_logged_in.title": "Ei kirjaantuneena sisään", "favourites.not_logged_in.message": "Kirjaudu sisään jotta voit lisätä tämän viestin suosikkeihisi.", "favourites.has_no_favourites": "Sinulla ei ole yhtään suosikkiviestiä.", + "vote.not_logged_in.title": "Not Logged In", + "vote.not_logged_in.message": "Please log in in order to vote", + "vote.cant_vote_self.title": "Invalid Vote", + "vote.cant_vote_self.message": "You cannot vote for your own post", "loading_more_posts": "Ladataan lisää viestejä", "move_topic": "Siirrä keskustelu", "move_post": "Siirrä viesti", diff --git a/public/language/fi/user.json b/public/language/fi/user.json index 189cba8d98..4e057d543b 100644 --- a/public/language/fi/user.json +++ b/public/language/fi/user.json @@ -9,6 +9,7 @@ "age": "Ikä", "joined": "Liittynyt", "lastonline": "Viimeksi online", + "profile": "Profile", "profile_views": "Profiilin katselukerrat", "reputation": "Maine", "posts": "Viestit", @@ -32,6 +33,7 @@ "show_email": "Näytä sähköpostiosoitteeni", "has_no_follower": "Tällä käyttäjällä ei ole yhtään seuraaja :(", "follows_no_one": "Tämä käyttäjä ei seuraa ketään :(", + "has_no_posts": "This user didn't post anything yet.", "email_hidden": "Sähköposti piilotettu", "hidden": "piilotettu" } \ No newline at end of file diff --git a/public/language/fr/notifications.json b/public/language/fr/notifications.json index c17dbb249e..03584b5832 100644 --- a/public/language/fr/notifications.json +++ b/public/language/fr/notifications.json @@ -1,5 +1,7 @@ { "title": "Notifications", + "no_notifs": "You have no notifications", + "see_all": "See all Notifications", "back_to_home": "Retour à NodeBB", "outgoing_link": "Lien Sortant", "outgoing_link_message": "Vous quitter NodeBB", diff --git a/public/language/fr/recent.json b/public/language/fr/recent.json index 530038718c..6972c3227e 100644 --- a/public/language/fr/recent.json +++ b/public/language/fr/recent.json @@ -2,5 +2,6 @@ "title": "Récent", "day": "Jour", "week": "Semaine", - "month": "Mois" + "month": "Mois", + "no_recent_topics": "There are no recent topics." } \ No newline at end of file diff --git a/public/language/fr/topic.json b/public/language/fr/topic.json index 29a28d26c1..5734e0713b 100644 --- a/public/language/fr/topic.json +++ b/public/language/fr/topic.json @@ -2,6 +2,7 @@ "topic": "Sujet", "topics": "Sujets", "no_topics_found": "Aucun sujet trouvé !", + "no_posts_found": "No posts found!", "profile": "Profil", "posted_by": "Posté par", "chat": "Chat", @@ -18,13 +19,17 @@ "tools": "Outils", "flag": "Signaler", "flag_title": "Signaler ce post pour modération", + "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "thread_tools.title": "Outils du Fil", "thread_tools.markAsUnreadForAll": "Marquer comme non lu", - "thread_tools.pin": "Epingler le fil", - "thread_tools.lock": "Verrouiller le fil", - "thread_tools.move": "Déplacer le fil", - "thread_tools.fork": "Scinder le fil", - "thread_tools.delete": "Supprimer le fil", + "thread_tools.pin": "Pin Topic", + "thread_tools.unpin": "Unpin Topic", + "thread_tools.lock": "Lock Topic", + "thread_tools.unlock": "Unlock Topic", + "thread_tools.move": "Move Topic", + "thread_tools.fork": "Fork Topic", + "thread_tools.delete": "Delete Topic", + "thread_tools.restore": "Restore Topic", "load_categories": "Chargement des Categories", "disabled_categories_note": "Les catégories désactivées sont grisées", "confirm_move": "Déplacer", diff --git a/public/language/he/notifications.json b/public/language/he/notifications.json index ce15fdacd6..1b0c6ddfe2 100644 --- a/public/language/he/notifications.json +++ b/public/language/he/notifications.json @@ -1,5 +1,7 @@ { "title": "התראות", + "no_notifs": "You have no notifications", + "see_all": "See all Notifications", "back_to_home": "חזרה ל NodeBB", "outgoing_link": "לינק", "outgoing_link_message": "אתה כעת עוזב", diff --git a/public/language/he/recent.json b/public/language/he/recent.json index e39f01e6bb..2b2ab609e1 100644 --- a/public/language/he/recent.json +++ b/public/language/he/recent.json @@ -2,5 +2,6 @@ "title": "אחרונים", "day": "יום", "week": "שבוע", - "month": "חודש" + "month": "חודש", + "no_recent_topics": "There are no recent topics." } \ No newline at end of file diff --git a/public/language/he/topic.json b/public/language/he/topic.json index 8afa5b590d..c30e374eb6 100644 --- a/public/language/he/topic.json +++ b/public/language/he/topic.json @@ -2,6 +2,7 @@ "topic": "נושא", "topics": "נושאים", "no_topics_found": "לא נמצאו נושאים!", + "no_posts_found": "No posts found!", "profile": "פרופיל", "posted_by": "פורסם על-ידי", "chat": "צ'אט", @@ -18,13 +19,17 @@ "tools": "כלים", "flag": "דווח", "flag_title": "דווח על פוסט זה למנהל", + "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "thread_tools.title": "כלים", "thread_tools.markAsUnreadForAll": "סמן כלא נקרא", - "thread_tools.pin": "נעץ נושא", - "thread_tools.lock": "נעל נושא", - "thread_tools.move": "הזז נושא", - "thread_tools.fork": "שכפל נושא", - "thread_tools.delete": "מחק נושא", + "thread_tools.pin": "Pin Topic", + "thread_tools.unpin": "Unpin Topic", + "thread_tools.lock": "Lock Topic", + "thread_tools.unlock": "Unlock Topic", + "thread_tools.move": "Move Topic", + "thread_tools.fork": "Fork Topic", + "thread_tools.delete": "Delete Topic", + "thread_tools.restore": "Restore Topic", "load_categories": "טוען קטגוריות", "disabled_categories_note": "קטגוריות מבוטלות צבועות באפור", "confirm_move": "הזז", diff --git a/public/language/hu/notifications.json b/public/language/hu/notifications.json index 98cc1ba510..02749af6af 100644 --- a/public/language/hu/notifications.json +++ b/public/language/hu/notifications.json @@ -1,5 +1,7 @@ { "title": "Értesítések", + "no_notifs": "You have no notifications", + "see_all": "See all Notifications", "back_to_home": "Vissza a NodeBB-re", "outgoing_link": "Külső Link", "outgoing_link_message": "Most távozol", diff --git a/public/language/hu/recent.json b/public/language/hu/recent.json index 8249314df2..a3b88d3581 100644 --- a/public/language/hu/recent.json +++ b/public/language/hu/recent.json @@ -2,5 +2,6 @@ "title": "Friss", "day": "Nap", "week": "Hét", - "month": "Hónap" + "month": "Hónap", + "no_recent_topics": "There are no recent topics." } \ No newline at end of file diff --git a/public/language/hu/topic.json b/public/language/hu/topic.json index b6f9ff4d47..e27e0ff78a 100644 --- a/public/language/hu/topic.json +++ b/public/language/hu/topic.json @@ -2,6 +2,7 @@ "topic": "Topik", "topics": "Topikok", "no_topics_found": "Téma nem található!", + "no_posts_found": "No posts found!", "profile": "Profil", "posted_by": "Hozzászólt:", "chat": "Chat", @@ -18,13 +19,17 @@ "tools": "Eszközök", "flag": "Jelentés", "flag_title": "A hozzászólás jelentése a moderátoroknál", + "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "thread_tools.title": "Téma Eszközök", "thread_tools.markAsUnreadForAll": "Olvasatlannak jelölés", - "thread_tools.pin": "Topik kiemelése", - "thread_tools.lock": "Topik Lezárása", - "thread_tools.move": "Topik Áthelyezése", - "thread_tools.fork": "Topik szétszedése", - "thread_tools.delete": "Topik törlése", + "thread_tools.pin": "Pin Topic", + "thread_tools.unpin": "Unpin Topic", + "thread_tools.lock": "Lock Topic", + "thread_tools.unlock": "Unlock Topic", + "thread_tools.move": "Move Topic", + "thread_tools.fork": "Fork Topic", + "thread_tools.delete": "Delete Topic", + "thread_tools.restore": "Restore Topic", "load_categories": "Kategóriák betöltése", "disabled_categories_note": "Kikapcsolt kategóriák kiszürkülve", "confirm_move": "Áthelyezés", @@ -34,6 +39,10 @@ "favourites.not_logged_in.title": "Nem vagy belépve", "favourites.not_logged_in.message": "Kérlek lépj be, hogy a kedvenceidhez adhassam a hozzászólást", "favourites.has_no_favourites": "Nincs egyetlen kedvenc hozzászólásod sem, jelölj meg párat hogy itt láthasd őket!", + "vote.not_logged_in.title": "Not Logged In", + "vote.not_logged_in.message": "Please log in in order to vote", + "vote.cant_vote_self.title": "Invalid Vote", + "vote.cant_vote_self.message": "You cannot vote for your own post", "loading_more_posts": "Hozzászólások betöltése", "move_topic": "Topik áthelyezése", "move_post": "Hozzászólás áthelyezése", diff --git a/public/language/hu/user.json b/public/language/hu/user.json index 2d958e3a35..87742aa2c5 100644 --- a/public/language/hu/user.json +++ b/public/language/hu/user.json @@ -9,6 +9,7 @@ "age": "Kor", "joined": "Csatlakozott", "lastonline": "Utoljára Online", + "profile": "Profile", "profile_views": "Profil megtekintések", "reputation": "Hírnév", "posts": "Hozzászólások", @@ -32,6 +33,7 @@ "show_email": "E-mail címem mutatása", "has_no_follower": "Ezt a felhasználót nem követi senki :(", "follows_no_one": "Ez a felhasználó nem követ senkit :(", + "has_no_posts": "This user didn't post anything yet.", "email_hidden": "E-mail rejtett", "hidden": "rejtett" } \ No newline at end of file diff --git a/public/language/it/notifications.json b/public/language/it/notifications.json index 9ee0333545..65bfd7370c 100644 --- a/public/language/it/notifications.json +++ b/public/language/it/notifications.json @@ -1,5 +1,7 @@ { "title": "Notifiche", + "no_notifs": "You have no notifications", + "see_all": "See all Notifications", "back_to_home": "Torna alla pagina iniziale", "outgoing_link": "Link in uscita", "outgoing_link_message": "Ci stai abbandonando", diff --git a/public/language/it/recent.json b/public/language/it/recent.json index 701fe98bdd..477ed8e887 100644 --- a/public/language/it/recent.json +++ b/public/language/it/recent.json @@ -2,5 +2,6 @@ "title": "Recent", "day": "Giorno", "week": "Settimana", - "month": "Mese" + "month": "Mese", + "no_recent_topics": "There are no recent topics." } \ No newline at end of file diff --git a/public/language/it/topic.json b/public/language/it/topic.json index 594f2d98a6..7b26b83790 100644 --- a/public/language/it/topic.json +++ b/public/language/it/topic.json @@ -2,6 +2,7 @@ "topic": "Discussione", "topics": "Discussioni", "no_topics_found": "Nessuna discussione trovata!", + "no_posts_found": "No posts found!", "profile": "Profilo", "posted_by": "Posted by", "chat": "Chat", @@ -18,13 +19,17 @@ "tools": "Tools", "flag": "Flag", "flag_title": "Flag this post for moderation", + "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "thread_tools.title": "Strumenti per il Thread", "thread_tools.markAsUnreadForAll": "Mark Unread", - "thread_tools.pin": "Appendi il Thread", - "thread_tools.lock": "Blocca il Thread", - "thread_tools.move": "Sposta il Thread", - "thread_tools.fork": "Fork Thread", - "thread_tools.delete": "Elimina il Thread", + "thread_tools.pin": "Pin Topic", + "thread_tools.unpin": "Unpin Topic", + "thread_tools.lock": "Lock Topic", + "thread_tools.unlock": "Unlock Topic", + "thread_tools.move": "Move Topic", + "thread_tools.fork": "Fork Topic", + "thread_tools.delete": "Delete Topic", + "thread_tools.restore": "Restore Topic", "load_categories": "Caricamento delle Categorie", "disabled_categories_note": "Le Categorie disabilitate sono in grigio", "confirm_move": "Sposta", @@ -34,6 +39,10 @@ "favourites.not_logged_in.title": "Non collegato/a", "favourites.not_logged_in.message": "Log in per aggiungere questo post ai preferiti", "favourites.has_no_favourites": "Non hai ancun post preferito; aggiungi qualche post ai preferiti per vederli qui!", + "vote.not_logged_in.title": "Not Logged In", + "vote.not_logged_in.message": "Please log in in order to vote", + "vote.cant_vote_self.title": "Invalid Vote", + "vote.cant_vote_self.message": "You cannot vote for your own post", "loading_more_posts": "Caricamento altri post", "move_topic": "Spsota Discussione", "move_post": "Sposta Post", diff --git a/public/language/it/user.json b/public/language/it/user.json index 73867d5d34..408cea7de9 100644 --- a/public/language/it/user.json +++ b/public/language/it/user.json @@ -9,6 +9,7 @@ "age": "Età", "joined": "Iscrizione", "lastonline": "Ultima volta in linea", + "profile": "Profile", "profile_views": "Visite al profilo", "reputation": "Reputazione", "posts": "Post", @@ -32,6 +33,7 @@ "show_email": "Mostra la mia Email", "has_no_follower": "Questo utente non è seguito da nessuno :(", "follows_no_one": "Questo utente non segue nessuno :(", + "has_no_posts": "This user didn't post anything yet.", "email_hidden": "Email Nascosta", "hidden": "nascosta" } \ No newline at end of file diff --git a/public/language/nb/notifications.json b/public/language/nb/notifications.json index 0486c6f595..9e92c5a11e 100644 --- a/public/language/nb/notifications.json +++ b/public/language/nb/notifications.json @@ -1,5 +1,7 @@ { "title": "Varsler", + "no_notifs": "You have no notifications", + "see_all": "See all Notifications", "back_to_home": "Tilbake til NodeBB", "outgoing_link": "Utgående link", "outgoing_link_message": "Du forlatter nå", diff --git a/public/language/nb/recent.json b/public/language/nb/recent.json index 467c5dd7a0..85335a6000 100644 --- a/public/language/nb/recent.json +++ b/public/language/nb/recent.json @@ -2,5 +2,6 @@ "title": "Seneste", "day": "Dag", "week": "Uke", - "month": "Måned" + "month": "Måned", + "no_recent_topics": "There are no recent topics." } \ No newline at end of file diff --git a/public/language/nb/topic.json b/public/language/nb/topic.json index 2514ab8ca1..2bac937542 100644 --- a/public/language/nb/topic.json +++ b/public/language/nb/topic.json @@ -2,6 +2,7 @@ "topic": "Emne", "topics": "Emner", "no_topics_found": "Ingen emner funnet!", + "no_posts_found": "No posts found!", "profile": "Profil", "posted_by": "Skapt av", "chat": "Chat", @@ -18,13 +19,17 @@ "tools": "Verktøy", "flag": "Rapporter", "flag_title": "Rapporter dette innlegget for granskning", + "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "thread_tools.title": "Trådverktøy", "thread_tools.markAsUnreadForAll": "Marker som ulest", - "thread_tools.pin": "Fest tråd", - "thread_tools.lock": "Lås tråd", - "thread_tools.move": "Flytt trå", - "thread_tools.fork": "Del tråd", - "thread_tools.delete": "Slett tråd", + "thread_tools.pin": "Pin Topic", + "thread_tools.unpin": "Unpin Topic", + "thread_tools.lock": "Lock Topic", + "thread_tools.unlock": "Unlock Topic", + "thread_tools.move": "Move Topic", + "thread_tools.fork": "Fork Topic", + "thread_tools.delete": "Delete Topic", + "thread_tools.restore": "Restore Topic", "load_categories": "Laster kategorier", "disabled_categories_note": "Deaktiverte kategorier er grået ut", "confirm_move": "Flytt", @@ -34,6 +39,10 @@ "favourites.not_logged_in.title": "Ikke logget inn", "favourites.not_logged_in.message": "Vennligst logg inn for å gjøre dette innlegget til favoritt", "favourites.has_no_favourites": "Du har ingen favoritter, marker noen innlegg som favoritt for å se dem her!", + "vote.not_logged_in.title": "Not Logged In", + "vote.not_logged_in.message": "Please log in in order to vote", + "vote.cant_vote_self.title": "Invalid Vote", + "vote.cant_vote_self.message": "You cannot vote for your own post", "loading_more_posts": "Laster flere innlegg", "move_topic": "Flytt emne", "move_post": "Flytt innlegg", diff --git a/public/language/nb/user.json b/public/language/nb/user.json index 73e843b628..22db5a59cc 100644 --- a/public/language/nb/user.json +++ b/public/language/nb/user.json @@ -9,6 +9,7 @@ "age": "Alder", "joined": "Ble med", "lastonline": "Senest online", + "profile": "Profile", "profile_views": "Profilvisninger", "reputation": "Rykte", "posts": "Innlegg", @@ -32,6 +33,7 @@ "show_email": "Vis min e-post", "has_no_follower": "Denne brukeren har ingen følgere :(", "follows_no_one": "Denne brukeren følger ingen :(", + "has_no_posts": "This user didn't post anything yet.", "email_hidden": "E-post skjult", "hidden": "skjult" } \ No newline at end of file diff --git a/public/language/pt_BR/notifications.json b/public/language/pt_BR/notifications.json index eaca864ad4..c2df59ec1d 100644 --- a/public/language/pt_BR/notifications.json +++ b/public/language/pt_BR/notifications.json @@ -1,5 +1,7 @@ { "title": "Notificações", + "no_notifs": "You have no notifications", + "see_all": "See all Notifications", "back_to_home": "voltar para home", "outgoing_link": "Link Externo", "outgoing_link_message": "Você está; saindo para um link externo", diff --git a/public/language/pt_BR/recent.json b/public/language/pt_BR/recent.json index af64551a70..b67b2e88b4 100644 --- a/public/language/pt_BR/recent.json +++ b/public/language/pt_BR/recent.json @@ -2,5 +2,6 @@ "title": "Recente", "day": "Dia", "week": "Semana", - "month": "Mês" + "month": "Mês", + "no_recent_topics": "There are no recent topics." } \ No newline at end of file diff --git a/public/language/pt_BR/topic.json b/public/language/pt_BR/topic.json index a6b8334cbb..8717077d6a 100644 --- a/public/language/pt_BR/topic.json +++ b/public/language/pt_BR/topic.json @@ -2,6 +2,7 @@ "topic": "Tópico", "topics": "Tópicos", "no_topics_found": "Nenhum tópico encontrado!", + "no_posts_found": "No posts found!", "profile": "Profile", "posted_by": "Postado por", "chat": "Bate Papo", @@ -18,13 +19,17 @@ "tools": "Ferramentas", "flag": "Marcar", "flag_title": "Marcar este post para moderação", + "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "thread_tools.title": "Ferramentas da Thread", "thread_tools.markAsUnreadForAll": "Marcar como não lido", - "thread_tools.pin": "Fixar Thread", - "thread_tools.lock": "Travar Thread", - "thread_tools.move": "Mover Thread", - "thread_tools.fork": "Fork Thread", - "thread_tools.delete": "Deletar Thread", + "thread_tools.pin": "Pin Topic", + "thread_tools.unpin": "Unpin Topic", + "thread_tools.lock": "Lock Topic", + "thread_tools.unlock": "Unlock Topic", + "thread_tools.move": "Move Topic", + "thread_tools.fork": "Fork Topic", + "thread_tools.delete": "Delete Topic", + "thread_tools.restore": "Restore Topic", "load_categories": "Carregando Categorias", "disabled_categories_note": "Categorias desabilitadas estão em cinza", "confirm_move": "Mover", @@ -34,6 +39,10 @@ "favourites.not_logged_in.title": "Não Logado", "favourites.not_logged_in.message": "Por Favor logar para favoritar o tópico", "favourites.has_no_favourites": "Você não tem nenhum item favoritado!", + "vote.not_logged_in.title": "Not Logged In", + "vote.not_logged_in.message": "Please log in in order to vote", + "vote.cant_vote_self.title": "Invalid Vote", + "vote.cant_vote_self.message": "You cannot vote for your own post", "loading_more_posts": "Carregando mais posts", "move_topic": "Mover Tó;pico", "move_post": "Mover Post", diff --git a/public/language/pt_BR/user.json b/public/language/pt_BR/user.json index 5b0287b7df..f37a3c87c8 100644 --- a/public/language/pt_BR/user.json +++ b/public/language/pt_BR/user.json @@ -9,6 +9,7 @@ "age": "Idade", "joined": "Cadastrou", "lastonline": "Última vez online", + "profile": "Profile", "profile_views": "Visualizações de Profile", "reputation": "Reputação", "posts": "Posts", @@ -32,6 +33,7 @@ "show_email": "Mostrar meu email", "has_no_follower": "Ninguém está seguindo esse usuário :(", "follows_no_one": "Este usuário não está seguindo ninguém :(", + "has_no_posts": "This user didn't post anything yet.", "email_hidden": "Email Escondido", "hidden": "Escondido" } \ No newline at end of file diff --git a/public/language/ru/notifications.json b/public/language/ru/notifications.json index 896fa0d231..f4ea1362a0 100644 --- a/public/language/ru/notifications.json +++ b/public/language/ru/notifications.json @@ -1,5 +1,7 @@ { "title": "Уведомления", + "no_notifs": "You have no notifications", + "see_all": "See all Notifications", "back_to_home": "Вернуться на NodeBB", "outgoing_link": "Внешняя ссылка", "outgoing_link_message": "Вы покидаете", diff --git a/public/language/ru/recent.json b/public/language/ru/recent.json index 7481687f39..5a810c8465 100644 --- a/public/language/ru/recent.json +++ b/public/language/ru/recent.json @@ -2,5 +2,6 @@ "title": "Последние", "day": "День", "week": "Неделя", - "month": "Месяц" + "month": "Месяц", + "no_recent_topics": "There are no recent topics." } \ No newline at end of file diff --git a/public/language/ru/topic.json b/public/language/ru/topic.json index 6c282dc9be..2947b2c4bb 100644 --- a/public/language/ru/topic.json +++ b/public/language/ru/topic.json @@ -2,6 +2,7 @@ "topic": "Тема", "topics": "Темы", "no_topics_found": "Тем не найдено!", + "no_posts_found": "No posts found!", "profile": "Профиль", "posted_by": "Создано", "chat": "Чат", @@ -18,13 +19,17 @@ "tools": "Опции", "flag": "Отметить", "flag_title": "Отметить сообщение для модерирования", + "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "thread_tools.title": "Опции Темы", "thread_tools.markAsUnreadForAll": "Отметить как непрочитанные", - "thread_tools.pin": "Закрепить Тему", - "thread_tools.lock": "Закрыть Тему", - "thread_tools.move": "Перенести Тему", - "thread_tools.fork": "Ответвить Тему", - "thread_tools.delete": "Удалить Тему", + "thread_tools.pin": "Pin Topic", + "thread_tools.unpin": "Unpin Topic", + "thread_tools.lock": "Lock Topic", + "thread_tools.unlock": "Unlock Topic", + "thread_tools.move": "Move Topic", + "thread_tools.fork": "Fork Topic", + "thread_tools.delete": "Delete Topic", + "thread_tools.restore": "Restore Topic", "load_categories": "Загружаем Категории", "disabled_categories_note": "Отключенные категории затемненны", "confirm_move": "Перенести", diff --git a/public/language/sk/notifications.json b/public/language/sk/notifications.json index 872e605465..5d9c1994ad 100644 --- a/public/language/sk/notifications.json +++ b/public/language/sk/notifications.json @@ -1,5 +1,7 @@ { "title": "Notifikácie", + "no_notifs": "You have no notifications", + "see_all": "See all Notifications", "back_to_home": "Späť na úvodnú stránku", "outgoing_link": "Odkaz mimo fórum", "outgoing_link_message": "Teraz opúšťate fórum", diff --git a/public/language/sk/recent.json b/public/language/sk/recent.json index 1d6ecd1506..e4f06c2b03 100644 --- a/public/language/sk/recent.json +++ b/public/language/sk/recent.json @@ -2,5 +2,6 @@ "title": "Nedávne", "day": "Deň", "week": "Týždeň", - "month": "Mesiac" + "month": "Mesiac", + "no_recent_topics": "There are no recent topics." } \ No newline at end of file diff --git a/public/language/sk/topic.json b/public/language/sk/topic.json index 6d4905e446..b87645274e 100644 --- a/public/language/sk/topic.json +++ b/public/language/sk/topic.json @@ -2,6 +2,7 @@ "topic": "Téma", "topics": "Témy", "no_topics_found": "Neboli nájdené žiadne témy!", + "no_posts_found": "No posts found!", "profile": "Profil", "posted_by": "Posted by", "chat": "Chat", @@ -18,13 +19,17 @@ "tools": "Nástroje", "flag": "Označiť", "flag_title": "Označiť príspevok pre moderáciu", + "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "thread_tools.title": "Nástroje", "thread_tools.markAsUnreadForAll": "Označ ako neprečítané", - "thread_tools.pin": "Zvýrazniť vlákno", - "thread_tools.lock": "Uzamknúť vlákno", - "thread_tools.move": "Presunúť vlákno", - "thread_tools.fork": "Rozdeliť vlákno", - "thread_tools.delete": "Zmazať vlákno", + "thread_tools.pin": "Pin Topic", + "thread_tools.unpin": "Unpin Topic", + "thread_tools.lock": "Lock Topic", + "thread_tools.unlock": "Unlock Topic", + "thread_tools.move": "Move Topic", + "thread_tools.fork": "Fork Topic", + "thread_tools.delete": "Delete Topic", + "thread_tools.restore": "Restore Topic", "load_categories": "Načítanie kategórií", "disabled_categories_note": "Vypnuté (disabled) kategorie sú šedé.", "confirm_move": "Presunúť", @@ -34,6 +39,10 @@ "favourites.not_logged_in.title": "Prihlásiť sa!", "favourites.not_logged_in.message": "Pre obľúbenie príspevku sa musíte prihlásiť.", "favourites.has_no_favourites": "Nemáte žiadne obľúbené príspevky, pridajte niektorý príspevok k obľúbeným a uvidíte ho tu!", + "vote.not_logged_in.title": "Not Logged In", + "vote.not_logged_in.message": "Please log in in order to vote", + "vote.cant_vote_self.title": "Invalid Vote", + "vote.cant_vote_self.message": "You cannot vote for your own post", "loading_more_posts": "Načítavanie viac príspevkov", "move_topic": "Presunúť tému", "move_post": "Presunúť príspevok", diff --git a/public/language/sk/user.json b/public/language/sk/user.json index 42d20628a9..61c503bdd8 100644 --- a/public/language/sk/user.json +++ b/public/language/sk/user.json @@ -9,6 +9,7 @@ "age": "Vek", "joined": "Registrovaný", "lastonline": "Naposledy online", + "profile": "Profile", "profile_views": "Zobrazenie profilu", "reputation": "Reputácia", "posts": "Príspevky", @@ -32,6 +33,7 @@ "show_email": "Zobrazovať môj email v profile", "has_no_follower": "Tohoto užívatela nikto nesleduje :(", "follows_no_one": "Tento užívateľ nikoho nesleduje :(", + "has_no_posts": "This user didn't post anything yet.", "email_hidden": "Skrytý email", "hidden": "skrytý" } \ No newline at end of file diff --git a/public/language/sv/notifications.json b/public/language/sv/notifications.json index 314beecd6c..cf9c3aab32 100644 --- a/public/language/sv/notifications.json +++ b/public/language/sv/notifications.json @@ -1,5 +1,7 @@ { "title": "Notiser", + "no_notifs": "You have no notifications", + "see_all": "See all Notifications", "back_to_home": "Tillbaka till NodeBB", "outgoing_link": "Utgående länk", "outgoing_link_message": "Du lämnar nu", diff --git a/public/language/sv/recent.json b/public/language/sv/recent.json index c031a9d3d7..c59d2bcec2 100644 --- a/public/language/sv/recent.json +++ b/public/language/sv/recent.json @@ -2,5 +2,6 @@ "title": "Senaste", "day": "Dag", "week": "Vecka", - "month": "Månad" + "month": "Månad", + "no_recent_topics": "There are no recent topics." } \ No newline at end of file diff --git a/public/language/sv/topic.json b/public/language/sv/topic.json index 89ed19dea4..2791b14e6c 100644 --- a/public/language/sv/topic.json +++ b/public/language/sv/topic.json @@ -2,6 +2,7 @@ "topic": "Ämne", "topics": "Ämnen", "no_topics_found": "Inga ämnen hittades!", + "no_posts_found": "No posts found!", "profile": "Profil", "posted_by": "Posted by", "chat": "Chatt", @@ -18,13 +19,17 @@ "tools": "Verktyg", "flag": "Rapportera", "flag_title": "Rapportera detta inlägg för granskning", + "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "thread_tools.title": "Trådverktyg", "thread_tools.markAsUnreadForAll": "Markera som oläst", - "thread_tools.pin": "Fäst tråd", - "thread_tools.lock": "Lås tråd", - "thread_tools.move": "Flytta tråd", - "thread_tools.fork": "Grena tråd", - "thread_tools.delete": "Ta bort tråd", + "thread_tools.pin": "Pin Topic", + "thread_tools.unpin": "Unpin Topic", + "thread_tools.lock": "Lock Topic", + "thread_tools.unlock": "Unlock Topic", + "thread_tools.move": "Move Topic", + "thread_tools.fork": "Fork Topic", + "thread_tools.delete": "Delete Topic", + "thread_tools.restore": "Restore Topic", "load_categories": "Laddar kategorier", "disabled_categories_note": "Inaktiverade kategorier är utgråade", "confirm_move": "Flytta", @@ -34,6 +39,10 @@ "favourites.not_logged_in.title": "Inte inloggad", "favourites.not_logged_in.message": "Var god logga in för att göra detta inlägg till favorit", "favourites.has_no_favourites": "Du har inga favoriter, markera inlägg som favorit för att se dem här!", + "vote.not_logged_in.title": "Not Logged In", + "vote.not_logged_in.message": "Please log in in order to vote", + "vote.cant_vote_self.title": "Invalid Vote", + "vote.cant_vote_self.message": "You cannot vote for your own post", "loading_more_posts": "Laddar fler inlägg", "move_topic": "Flytta ämne", "move_post": "Flytta inlägg", diff --git a/public/language/sv/user.json b/public/language/sv/user.json index a33d9a80e1..6344013650 100644 --- a/public/language/sv/user.json +++ b/public/language/sv/user.json @@ -9,6 +9,7 @@ "age": "Ålder", "joined": "Gick med", "lastonline": "Senast online", + "profile": "Profile", "profile_views": "Profil-visningar", "reputation": "Rykte", "posts": "Inlägg", @@ -32,6 +33,7 @@ "show_email": "Visa min epost", "has_no_follower": "Denna användare har inga följare :(", "follows_no_one": "Denna användare följer ingen :(", + "has_no_posts": "This user didn't post anything yet.", "email_hidden": "Epost dold", "hidden": "dold" } \ No newline at end of file diff --git a/public/language/tr/notifications.json b/public/language/tr/notifications.json index e8ba91f3d8..5e6d7e1467 100644 --- a/public/language/tr/notifications.json +++ b/public/language/tr/notifications.json @@ -1,5 +1,7 @@ { "title": "Bildirimler", + "no_notifs": "You have no notifications", + "see_all": "See all Notifications", "back_to_home": "NodeBB'ye geri dön", "outgoing_link": "Harici Link", "outgoing_link_message": "Şimdi ayrılıyorsunuz", diff --git a/public/language/tr/recent.json b/public/language/tr/recent.json index f68c731806..71e40bb9c0 100644 --- a/public/language/tr/recent.json +++ b/public/language/tr/recent.json @@ -2,5 +2,6 @@ "title": "Güncel", "day": "Gün", "week": "Hafta", - "month": "Ay" + "month": "Ay", + "no_recent_topics": "There are no recent topics." } \ No newline at end of file diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json index d92d8d49a3..fb293ec66f 100644 --- a/public/language/tr/topic.json +++ b/public/language/tr/topic.json @@ -2,6 +2,7 @@ "topic": "Konu", "topics": "Konular", "no_topics_found": "Hiç konu bulunamadı!", + "no_posts_found": "No posts found!", "profile": "Profil", "posted_by": "tarafından gönderildi", "chat": "Sohbet", @@ -18,13 +19,17 @@ "tools": "Araçlar", "flag": "Bayrak", "flag_title": "Bu iletiyi moderatöre haber et", + "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "thread_tools.title": "Seçenekler", "thread_tools.markAsUnreadForAll": "Okunmadı Olarak İşaretle", - "thread_tools.pin": "Pin Thread", - "thread_tools.lock": "Lock Thread", - "thread_tools.move": "Move Thread", - "thread_tools.fork": "Fork Thread", - "thread_tools.delete": "Delete Thread", + "thread_tools.pin": "Pin Topic", + "thread_tools.unpin": "Unpin Topic", + "thread_tools.lock": "Lock Topic", + "thread_tools.unlock": "Unlock Topic", + "thread_tools.move": "Move Topic", + "thread_tools.fork": "Fork Topic", + "thread_tools.delete": "Delete Topic", + "thread_tools.restore": "Restore Topic", "load_categories": "Kategoriler Yükleniyor", "disabled_categories_note": "Etkin Olmayan Kategoriler soluklaştırılır", "confirm_move": "Taşı", @@ -34,6 +39,10 @@ "favourites.not_logged_in.title": "Oturum açılmadı", "favourites.not_logged_in.message": "Lütfen bu iletiyi favorilere eklemek için giriş yapın", "favourites.has_no_favourites": "Favorilerde hiç iletiniz yok, görebilmek için iletileri favorilere ekleyin.", + "vote.not_logged_in.title": "Not Logged In", + "vote.not_logged_in.message": "Please log in in order to vote", + "vote.cant_vote_self.title": "Invalid Vote", + "vote.cant_vote_self.message": "You cannot vote for your own post", "loading_more_posts": "Daha fazla ileti ", "move_topic": "Başlığı Taş", "move_post": "İletiyi Taşı", diff --git a/public/language/tr/user.json b/public/language/tr/user.json index d84e96572c..c5dc21bc47 100644 --- a/public/language/tr/user.json +++ b/public/language/tr/user.json @@ -9,6 +9,7 @@ "age": "Yaş", "joined": "Katıldı", "lastonline": "En Son Çevrimiçi", + "profile": "Profile", "profile_views": "Profil Görüntülemeleri", "reputation": "Saygınlık", "posts": "İletiler", @@ -32,6 +33,7 @@ "show_email": "E-postamı göster", "has_no_follower": "Bu kullanıcının hiç takipçisi yok :(", "follows_no_one": "Bu kullanıcı kimseyi takip etmiyor :(", + "has_no_posts": "This user didn't post anything yet.", "email_hidden": "E-posta gizli", "hidden": "gizli" } \ No newline at end of file diff --git a/public/language/zh_CN/notifications.json b/public/language/zh_CN/notifications.json index a30a7dae04..d9cbdf9ada 100644 --- a/public/language/zh_CN/notifications.json +++ b/public/language/zh_CN/notifications.json @@ -1,5 +1,7 @@ { "title": "消息", + "no_notifs": "You have no notifications", + "see_all": "See all Notifications", "back_to_home": "返回主页", "outgoing_link": "站外链接", "outgoing_link_message": "你正在离开本站。", diff --git a/public/language/zh_CN/recent.json b/public/language/zh_CN/recent.json index 66b724b9d7..179cf32202 100644 --- a/public/language/zh_CN/recent.json +++ b/public/language/zh_CN/recent.json @@ -2,5 +2,6 @@ "title": "Recent", "day": "今日", "week": "本周", - "month": "本月" + "month": "本月", + "no_recent_topics": "There are no recent topics." } \ No newline at end of file diff --git a/public/language/zh_CN/topic.json b/public/language/zh_CN/topic.json index 2b03801044..6b78645c54 100644 --- a/public/language/zh_CN/topic.json +++ b/public/language/zh_CN/topic.json @@ -2,6 +2,7 @@ "topic": "主题", "topics": "主题", "no_topics_found": "没有找到主题！", + "no_posts_found": "No posts found!", "profile": "资料", "posted_by": "Posted by", "chat": "聊天", @@ -18,13 +19,17 @@ "tools": "Tools", "flag": "Flag", "flag_title": "Flag this post for moderation", + "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "thread_tools.title": "管理工具", "thread_tools.markAsUnreadForAll": "Mark Unread", - "thread_tools.pin": "置顶帖子", - "thread_tools.lock": "锁定帖子", - "thread_tools.move": "移动帖子", - "thread_tools.fork": "作为主题", - "thread_tools.delete": "删除帖子", + "thread_tools.pin": "Pin Topic", + "thread_tools.unpin": "Unpin Topic", + "thread_tools.lock": "Lock Topic", + "thread_tools.unlock": "Unlock Topic", + "thread_tools.move": "Move Topic", + "thread_tools.fork": "Fork Topic", + "thread_tools.delete": "Delete Topic", + "thread_tools.restore": "Restore Topic", "load_categories": "版面载入中", "disabled_categories_note": "停用的版面为灰色", "confirm_move": "移动", @@ -34,6 +39,10 @@ "favourites.not_logged_in.title": "未登录", "favourites.not_logged_in.message": "收藏帖子之前请先登录。", "favourites.has_no_favourites": "你还没有任何收藏，收藏的帖子将会出现在这里！", + "vote.not_logged_in.title": "Not Logged In", + "vote.not_logged_in.message": "Please log in in order to vote", + "vote.cant_vote_self.title": "Invalid Vote", + "vote.cant_vote_self.message": "You cannot vote for your own post", "loading_more_posts": "载入更多帖子", "move_topic": "移动主题", "move_post": "移动帖子", diff --git a/public/language/zh_CN/user.json b/public/language/zh_CN/user.json index 3f96707e61..4ffd13b731 100644 --- a/public/language/zh_CN/user.json +++ b/public/language/zh_CN/user.json @@ -9,6 +9,7 @@ "age": "年龄", "joined": "加入时间", "lastonline": "最后在线", + "profile": "Profile", "profile_views": "资料被查看", "reputation": "声望", "posts": "发帖数", @@ -32,6 +33,7 @@ "show_email": "显示我的邮箱", "has_no_follower": "该用户还没有被任何人关注。", "follows_no_one": "该用户还没有关注过任何人。", + "has_no_posts": "This user didn't post anything yet.", "email_hidden": "邮箱被隐藏", "hidden": "隐藏" } \ No newline at end of file diff --git a/public/language/zh_TW/notifications.json b/public/language/zh_TW/notifications.json index 87c302531b..3679409b56 100644 --- a/public/language/zh_TW/notifications.json +++ b/public/language/zh_TW/notifications.json @@ -1,5 +1,7 @@ { "title": "消息", + "no_notifs": "You have no notifications", + "see_all": "See all Notifications", "back_to_home": "返回主頁", "outgoing_link": "站外鏈接", "outgoing_link_message": "你正在離開本站。", diff --git a/public/language/zh_TW/recent.json b/public/language/zh_TW/recent.json index 66b724b9d7..179cf32202 100644 --- a/public/language/zh_TW/recent.json +++ b/public/language/zh_TW/recent.json @@ -2,5 +2,6 @@ "title": "Recent", "day": "今日", "week": "本周", - "month": "本月" + "month": "本月", + "no_recent_topics": "There are no recent topics." } \ No newline at end of file diff --git a/public/language/zh_TW/topic.json b/public/language/zh_TW/topic.json index d2d32b29d3..ccfab49a41 100644 --- a/public/language/zh_TW/topic.json +++ b/public/language/zh_TW/topic.json @@ -2,6 +2,7 @@ "topic": "主題", "topics": "主題", "no_topics_found": "沒有找到主題！", + "no_posts_found": "No posts found!", "profile": "資料", "posted_by": "Posted by", "chat": "聊天", @@ -18,13 +19,17 @@ "tools": "Tools", "flag": "Flag", "flag_title": "Flag this post for moderation", + "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "thread_tools.title": "管理工具", "thread_tools.markAsUnreadForAll": "Mark Unread", - "thread_tools.pin": "置頂帖子", - "thread_tools.lock": "鎖定帖子", - "thread_tools.move": "移動帖子", - "thread_tools.fork": "作為主題", - "thread_tools.delete": "刪除帖子", + "thread_tools.pin": "Pin Topic", + "thread_tools.unpin": "Unpin Topic", + "thread_tools.lock": "Lock Topic", + "thread_tools.unlock": "Unlock Topic", + "thread_tools.move": "Move Topic", + "thread_tools.fork": "Fork Topic", + "thread_tools.delete": "Delete Topic", + "thread_tools.restore": "Restore Topic", "load_categories": "版面載入中", "disabled_categories_note": "停用的版面為灰色", "confirm_move": "移動", @@ -34,6 +39,10 @@ "favourites.not_logged_in.title": "未登錄", "favourites.not_logged_in.message": "收藏帖子之前請先登錄。", "favourites.has_no_favourites": "你還沒有任何收藏，收藏的帖子將會出現在這裡！", + "vote.not_logged_in.title": "Not Logged In", + "vote.not_logged_in.message": "Please log in in order to vote", + "vote.cant_vote_self.title": "Invalid Vote", + "vote.cant_vote_self.message": "You cannot vote for your own post", "loading_more_posts": "載入更多帖子", "move_topic": "移動主題", "move_post": "移動帖子", diff --git a/public/language/zh_TW/user.json b/public/language/zh_TW/user.json index bb212eab53..0a43ba7a84 100644 --- a/public/language/zh_TW/user.json +++ b/public/language/zh_TW/user.json @@ -9,6 +9,7 @@ "age": "年齡", "joined": "加入時間", "lastonline": "最后在線", + "profile": "Profile", "profile_views": "資料被查看", "reputation": "聲望", "posts": "發帖數", @@ -32,6 +33,7 @@ "show_email": "顯示我的郵箱", "has_no_follower": "該用戶還沒有被任何人關注。", "follows_no_one": "該用戶還沒有關注過任何人。", + "has_no_posts": "This user didn't post anything yet.", "email_hidden": "郵箱被隱藏", "hidden": "隱藏" } \ No newline at end of file From d02a1ef40af5836f59903dcbf3e16c4e97139246 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 10 Feb 2014 13:29:59 -0500 Subject: [PATCH 06/10] actually fixes #985 --- src/topics.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/topics.js b/src/topics.js index 79a2423252..86a899dfcd 100644 --- a/src/topics.js +++ b/src/topics.js @@ -176,6 +176,7 @@ var async = require('async'), }, function(postData, next) { postData.favourited = false; + postData.votes = 0; postData.display_moderator_tools = true; postData.display_move_tools = privileges.admin || privileges.moderator; postData.relativeTime = utils.toISOString(postData.timestamp); From 55b39f1eff1d6f8e512bb534735f2da8bcbb4bff Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 10 Feb 2014 13:30:26 -0500 Subject: [PATCH 07/10] second pass, #981 --- public/language/en_GB/topic.json | 10 +- public/src/modules/composer.js | 397 ++++++++++++++++--------------- public/templates/composer.tpl | 10 +- 3 files changed, 215 insertions(+), 202 deletions(-) diff --git a/public/language/en_GB/topic.json b/public/language/en_GB/topic.json index 12778f9a4e..a3b2f62c82 100644 --- a/public/language/en_GB/topic.json +++ b/public/language/en_GB/topic.json @@ -61,5 +61,13 @@ "fork_success": "Succesfully forked topic!", "reputation": "Reputation", - "posts": "Posts" + "posts": "Posts", + + "composer.title_placeholder": "Enter your topic title here...", + "composer.write": "Write", + "composer.preview": "Preview", + "composer.discard": "Discard", + "composer.submit": "Submit", + "composer.replying_to": "Replying to", + "composer.new_topic": "New Topic" } diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js index 52a2c363c2..d33e5f1372 100644 --- a/public/src/modules/composer.js +++ b/public/src/modules/composer.js @@ -82,9 +82,11 @@ define(['taskbar'], function(taskbar) { function push(post) { var uuid = utils.generateUUID(); - taskbar.push('composer', uuid, { - title: post.title ? post.title : 'New Topic', - icon: post.picture + translator.translate('[[topic:composer.new_topic]]', function(newTopicStr) { + taskbar.push('composer', uuid, { + title: post.title ? post.title : newTopicStr, + icon: post.picture + }); }); composer.posts[uuid] = post; @@ -103,227 +105,230 @@ define(['taskbar'], function(taskbar) { composer.createNewComposer = function(post_uuid) { templates.preload_template('composer', function() { - var composerTemplate = templates['composer'].parse({}); - composerTemplate = $(composerTemplate); + translator.translate(composerTemplate, function(composerTemplate) { + composerTemplate = $(composerTemplate); - composerTemplate.attr('id', 'cmp-uuid-' + post_uuid); + composerTemplate.attr('id', 'cmp-uuid-' + post_uuid); - $(document.body).append(composerTemplate); + $(document.body).append(composerTemplate); - composer.activateReposition(post_uuid); + composer.activateReposition(post_uuid); - var postContainer = $(composerTemplate[0]); - - if(config.allowFileUploads || config.hasImageUploadPlugin) { - initializeFileReader(post_uuid); - } + var postContainer = $(composerTemplate[0]); - var postData = composer.posts[post_uuid], - titleEl = postContainer.find('.title'), - bodyEl = postContainer.find('textarea'); - - if (parseInt(postData.tid) > 0) { - titleEl.val('Replying to: ' + postData.title); - titleEl.prop('disabled', true); - } else if (parseInt(postData.pid) > 0) { - titleEl.val(postData.title); - titleEl.prop('disabled', true); - socket.emit('modules.composer.editCheck', postData.pid, function(err, editCheck) { - if (!err && editCheck.titleEditable) { - titleEl.prop('disabled', false); - } - }); - } else { - titleEl.val(postData.title); - titleEl.prop('disabled', false); - } + if(config.allowFileUploads || config.hasImageUploadPlugin) { + initializeFileReader(post_uuid); + } - bodyEl.val(postData.body); + var postData = composer.posts[post_uuid], + titleEl = postContainer.find('.title'), + bodyEl = postContainer.find('textarea'); + + if (parseInt(postData.tid) > 0) { + translator.translate('[[topic:composer.replying_to]]: ' + postData.title, function(newTitle) { + titleEl.val(newTitle); + }); + titleEl.prop('disabled', true); + } else if (parseInt(postData.pid) > 0) { + titleEl.val(postData.title); + titleEl.prop('disabled', true); + socket.emit('modules.composer.editCheck', postData.pid, function(err, editCheck) { + if (!err && editCheck.titleEditable) { + titleEl.prop('disabled', false); + } + }); + } else { + titleEl.val(postData.title); + titleEl.prop('disabled', false); + } + bodyEl.val(postData.body); - postContainer.on('change', 'input, textarea', function() { - composer.posts[post_uuid].modified = true; - }); - postContainer.on('click', '.action-bar button', function() { - var action = $(this).attr('data-action'); + postContainer.on('change', 'input, textarea', function() { + composer.posts[post_uuid].modified = true; + }); - switch(action) { - case 'post': - $(this).attr('disabled', true); - composer.post(post_uuid); - break; - case 'discard': - if (composer.posts[post_uuid].modified) { - bootbox.confirm('Are you sure you wish to discard this post?', function(discard) { - if (discard) { - composer.discard(post_uuid); - } - }); - } else { - composer.discard(post_uuid); - } - break; - } - }); + postContainer.on('click', '.action-bar button', function() { + var action = $(this).attr('data-action'); + + switch(action) { + case 'post': + $(this).attr('disabled', true); + composer.post(post_uuid); + break; + case 'discard': + if (composer.posts[post_uuid].modified) { + bootbox.confirm('Are you sure you wish to discard this post?', function(discard) { + if (discard) { + composer.discard(post_uuid); + } + }); + } else { + composer.discard(post_uuid); + } + break; + } + }); - postContainer.on('click', '.formatting-bar span', function() { - var postContentEl = postContainer.find('textarea'), - iconClass = $(this).find('i').attr('class'), - cursorEnd = postContentEl.val().length, - selectionStart = postContentEl[0].selectionStart, - selectionEnd = postContentEl[0].selectionEnd, - selectionLength = selectionEnd - selectionStart; + postContainer.on('click', '.formatting-bar span', function() { + var postContentEl = postContainer.find('textarea'), + iconClass = $(this).find('i').attr('class'), + cursorEnd = postContentEl.val().length, + selectionStart = postContentEl[0].selectionStart, + selectionEnd = postContentEl[0].selectionEnd, + selectionLength = selectionEnd - selectionStart; - function insertIntoInput(element, value) { - var start = postContentEl[0].selectionStart; - element.val(element.val().slice(0, start) + value + element.val().slice(start, element.val().length)); - postContentEl[0].selectionStart = postContentEl[0].selectionEnd = start + value.length; - } + function insertIntoInput(element, value) { + var start = postContentEl[0].selectionStart; + element.val(element.val().slice(0, start) + value + element.val().slice(start, element.val().length)); + postContentEl[0].selectionStart = postContentEl[0].selectionEnd = start + value.length; + } - switch(iconClass) { - case 'fa fa-bold': - if (selectionStart === selectionEnd) { - // Nothing selected - insertIntoInput(postContentEl, "**bolded text**"); - } else { - // Text selected - postContentEl.val(postContentEl.val().slice(0, selectionStart) + '**' + postContentEl.val().slice(selectionStart, selectionEnd) + '**' + postContentEl.val().slice(selectionEnd)); - postContentEl[0].selectionStart = selectionStart + 2; - postContentEl[0].selectionEnd = selectionEnd + 2; - } - break; - case 'fa fa-italic': - if (selectionStart === selectionEnd) { - // Nothing selected - insertIntoInput(postContentEl, "*italicised text*"); - } else { - // Text selected - postContentEl.val(postContentEl.val().slice(0, selectionStart) + '*' + postContentEl.val().slice(selectionStart, selectionEnd) + '*' + postContentEl.val().slice(selectionEnd)); - postContentEl[0].selectionStart = selectionStart + 1; - postContentEl[0].selectionEnd = selectionEnd + 1; - } - break; - case 'fa fa-list': - // Nothing selected - insertIntoInput(postContentEl, "\n* list item"); - break; - case 'fa fa-link': - if (selectionStart === selectionEnd) { + switch(iconClass) { + case 'fa fa-bold': + if (selectionStart === selectionEnd) { + // Nothing selected + insertIntoInput(postContentEl, "**bolded text**"); + } else { + // Text selected + postContentEl.val(postContentEl.val().slice(0, selectionStart) + '**' + postContentEl.val().slice(selectionStart, selectionEnd) + '**' + postContentEl.val().slice(selectionEnd)); + postContentEl[0].selectionStart = selectionStart + 2; + postContentEl[0].selectionEnd = selectionEnd + 2; + } + break; + case 'fa fa-italic': + if (selectionStart === selectionEnd) { + // Nothing selected + insertIntoInput(postContentEl, "*italicised text*"); + } else { + // Text selected + postContentEl.val(postContentEl.val().slice(0, selectionStart) + '*' + postContentEl.val().slice(selectionStart, selectionEnd) + '*' + postContentEl.val().slice(selectionEnd)); + postContentEl[0].selectionStart = selectionStart + 1; + postContentEl[0].selectionEnd = selectionEnd + 1; + } + break; + case 'fa fa-list': // Nothing selected - insertIntoInput(postContentEl, "[link text](link url)"); - } else { - // Text selected - postContentEl.val(postContentEl.val().slice(0, selectionStart) + '[' + postContentEl.val().slice(selectionStart, selectionEnd) + '](link url)' + postContentEl.val().slice(selectionEnd)); - postContentEl[0].selectionStart = selectionStart + selectionLength + 3; - postContentEl[0].selectionEnd = selectionEnd + 11; - } - break; - } - }); + insertIntoInput(postContentEl, "\n* list item"); + break; + case 'fa fa-link': + if (selectionStart === selectionEnd) { + // Nothing selected + insertIntoInput(postContentEl, "[link text](link url)"); + } else { + // Text selected + postContentEl.val(postContentEl.val().slice(0, selectionStart) + '[' + postContentEl.val().slice(selectionStart, selectionEnd) + '](link url)' + postContentEl.val().slice(selectionEnd)); + postContentEl[0].selectionStart = selectionStart + selectionLength + 3; + postContentEl[0].selectionEnd = selectionEnd + 11; + } + break; + } + }); - postContainer.on('click', '.formatting-bar span .fa-picture-o, .formatting-bar span .fa-upload', function() { - $('#files').click(); - }); + postContainer.on('click', '.formatting-bar span .fa-picture-o, .formatting-bar span .fa-upload', function() { + $('#files').click(); + }); - $('#files').on('change', function(e) { - var files = e.target.files; - if(files) { - for (var i=0; i $(window).height() - $('#header-menu').height() - 20) { - newHeight = $(window).height() - $('#header-menu').height() - 20; - } else if (newHeight < paddingBottom) { - newHeight = paddingBottom; + var resizeActive = false, + resizeCenterY = 0, + resizeOffset = 0, + resizeStart = function(e) { + resizeRect = resizeEl.getBoundingClientRect(); + resizeCenterY = resizeRect.top + (resizeRect.height/2); + resizeOffset = resizeCenterY - e.clientY; + resizeActive = true; + + $(window).on('mousemove', resizeAction); + $(window).on('mouseup', resizeStop); + document.body.addEventListener('touchmove', resizeTouchAction); + }, + resizeStop = function() { + resizeActive = false; + bodyEl.focus(); + $(window).off('mousemove', resizeAction); + $(window).off('mouseup', resizeStop); + document.body.removeEventListener('touchmove', resizeTouchAction); + }, + resizeTouchAction = function(e) { + e.preventDefault(); + resizeAction(e.touches[0]); + }, + resizeAction = function(e) { + if (resizeActive) { + position = (e.clientY + resizeOffset); + var newHeight = $(window).height() - position; + var paddingBottom = parseInt(postContainer.css('padding-bottom'), 10); + if(newHeight > $(window).height() - $('#header-menu').height() - 20) { + newHeight = $(window).height() - $('#header-menu').height() - 20; + } else if (newHeight < paddingBottom) { + newHeight = paddingBottom; + } + + postContainer.css('height', newHeight); + $('body').css({'margin-bottom': newHeight}); + resizeSavePosition(newHeight); } + e.preventDefault(); + return false; + }, + resizeSavePosition = function(px) { + var percentage = px / $(window).height(); + localStorage.setItem('composer:resizePercentage', percentage); + }, + resizeRect; - postContainer.css('height', newHeight); - $('body').css({'margin-bottom': newHeight}); - resizeSavePosition(newHeight); - } - e.preventDefault(); - return false; - }, - resizeSavePosition = function(px) { - var percentage = px / $(window).height(); - localStorage.setItem('composer:resizePercentage', percentage); - }, - resizeRect; + var resizeEl = postContainer.find('.resizer')[0]; - var resizeEl = postContainer.find('.resizer')[0]; + resizeEl.addEventListener('mousedown', resizeStart); - resizeEl.addEventListener('mousedown', resizeStart); - - resizeEl.addEventListener('touchstart', function(e) { - e.preventDefault(); - resizeStart(e.touches[0]); - }); - resizeEl.addEventListener('touchend', function(e) { - e.preventDefault(); - resizeStop(); - }); - // .on('mousedown touchstart', resizeStart) - // .on('mouseup touchend', resizeStop) + resizeEl.addEventListener('touchstart', function(e) { + e.preventDefault(); + resizeStart(e.touches[0]); + }); + resizeEl.addEventListener('touchend', function(e) { + e.preventDefault(); + resizeStop(); + }); + // .on('mousedown touchstart', resizeStart) + // .on('mouseup touchend', resizeStop) - window.addEventListener('resize', function() { - if (composer.active !== undefined) { - composer.activateReposition(composer.active); - } + window.addEventListener('resize', function() { + if (composer.active !== undefined) { + composer.activateReposition(composer.active); + } + }); }); }); } diff --git a/public/templates/composer.tpl b/public/templates/composer.tpl index 0c0ef31702..4f2d7c15a0 100644 --- a/public/templates/composer.tpl +++ b/public/templates/composer.tpl @@ -1,6 +1,6 @@
    - +
    @@ -20,11 +20,11 @@
    From e231a523698b60abf2a8697f5e6a3767c51e03b9 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 10 Feb 2014 13:31:53 -0500 Subject: [PATCH 08/10] new translations, plus fallbacks for new strings to English --- public/language/ar/topic.json | 9 ++++++- public/language/cs/topic.json | 9 ++++++- public/language/de/topic.json | 9 ++++++- public/language/es/topic.json | 9 ++++++- public/language/fi/topic.json | 9 ++++++- public/language/fr/topic.json | 15 ++++++++--- public/language/he/topic.json | 9 ++++++- public/language/hu/topic.json | 9 ++++++- public/language/it/topic.json | 9 ++++++- public/language/nb/notifications.json | 4 +-- public/language/nb/recent.json | 2 +- public/language/nb/topic.json | 37 ++++++++++++++++----------- public/language/nb/user.json | 4 +-- public/language/pt_BR/topic.json | 9 ++++++- public/language/ru/topic.json | 9 ++++++- public/language/sk/topic.json | 9 ++++++- public/language/sv/topic.json | 9 ++++++- public/language/tr/topic.json | 9 ++++++- public/language/zh_CN/topic.json | 9 ++++++- public/language/zh_TW/topic.json | 9 ++++++- 20 files changed, 158 insertions(+), 39 deletions(-) diff --git a/public/language/ar/topic.json b/public/language/ar/topic.json index a022f2987d..58217661cd 100644 --- a/public/language/ar/topic.json +++ b/public/language/ar/topic.json @@ -52,5 +52,12 @@ "fork_no_pids": "لم تختار أي رد", "fork_success": "تفريع الموضوع بنجاح!", "reputation": "سمعة", - "posts": "ردود" + "posts": "ردود", + "composer.title_placeholder": "Enter your topic title here...", + "composer.write": "Write", + "composer.preview": "Preview", + "composer.discard": "Discard", + "composer.submit": "Submit", + "composer.replying_to": "Replying to", + "composer.new_topic": "New Topic" } \ No newline at end of file diff --git a/public/language/cs/topic.json b/public/language/cs/topic.json index bd1f04645b..a0cd0bd05f 100644 --- a/public/language/cs/topic.json +++ b/public/language/cs/topic.json @@ -52,5 +52,12 @@ "fork_no_pids": "Žádné příspěvky nebyly vybrány!", "fork_success": "Téma bylo úspěšně rozděleno!", "reputation": "Reputace", - "posts": "Příspěvky" + "posts": "Příspěvky", + "composer.title_placeholder": "Enter your topic title here...", + "composer.write": "Write", + "composer.preview": "Preview", + "composer.discard": "Discard", + "composer.submit": "Submit", + "composer.replying_to": "Replying to", + "composer.new_topic": "New Topic" } \ No newline at end of file diff --git a/public/language/de/topic.json b/public/language/de/topic.json index 161f3fe3c8..53d446aa48 100644 --- a/public/language/de/topic.json +++ b/public/language/de/topic.json @@ -52,5 +52,12 @@ "fork_no_pids": "Keine Beiträge ausgewählt!", "fork_success": "Thema erfolgreich aufgespalten!", "reputation": "Reputation", - "posts": "Beiträge" + "posts": "Beiträge", + "composer.title_placeholder": "Enter your topic title here...", + "composer.write": "Write", + "composer.preview": "Preview", + "composer.discard": "Discard", + "composer.submit": "Submit", + "composer.replying_to": "Replying to", + "composer.new_topic": "New Topic" } \ No newline at end of file diff --git a/public/language/es/topic.json b/public/language/es/topic.json index be98dac70b..690b4c14e7 100644 --- a/public/language/es/topic.json +++ b/public/language/es/topic.json @@ -52,5 +52,12 @@ "fork_no_pids": "No seleccionaste posts!", "fork_success": "Forkeado con exito!", "reputation": "Reputación", - "posts": "Posts" + "posts": "Posts", + "composer.title_placeholder": "Enter your topic title here...", + "composer.write": "Write", + "composer.preview": "Preview", + "composer.discard": "Discard", + "composer.submit": "Submit", + "composer.replying_to": "Replying to", + "composer.new_topic": "New Topic" } \ No newline at end of file diff --git a/public/language/fi/topic.json b/public/language/fi/topic.json index f361b15685..17c23a3753 100644 --- a/public/language/fi/topic.json +++ b/public/language/fi/topic.json @@ -52,5 +52,12 @@ "fork_no_pids": "Ei valittuja viestejä!", "fork_success": "Keskustelu haaroitettu onnistuneesti!", "reputation": "Maine", - "posts": "Viestejä" + "posts": "Viestejä", + "composer.title_placeholder": "Enter your topic title here...", + "composer.write": "Write", + "composer.preview": "Preview", + "composer.discard": "Discard", + "composer.submit": "Submit", + "composer.replying_to": "Replying to", + "composer.new_topic": "New Topic" } \ No newline at end of file diff --git a/public/language/fr/topic.json b/public/language/fr/topic.json index 5734e0713b..8d487451a3 100644 --- a/public/language/fr/topic.json +++ b/public/language/fr/topic.json @@ -2,7 +2,7 @@ "topic": "Sujet", "topics": "Sujets", "no_topics_found": "Aucun sujet trouvé !", - "no_posts_found": "No posts found!", + "no_posts_found": "Aucun message trouvé!", "profile": "Profil", "posted_by": "Posté par", "chat": "Chat", @@ -19,10 +19,10 @@ "tools": "Outils", "flag": "Signaler", "flag_title": "Signaler ce post pour modération", - "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", + "deleted_message": "Ce sujet a été supprimé. Seuls les utilsateurs avec les droits d'administration peuvent le voir.", "thread_tools.title": "Outils du Fil", "thread_tools.markAsUnreadForAll": "Marquer comme non lu", - "thread_tools.pin": "Pin Topic", + "thread_tools.pin": "Epingler le Sujet", "thread_tools.unpin": "Unpin Topic", "thread_tools.lock": "Lock Topic", "thread_tools.unlock": "Unlock Topic", @@ -52,5 +52,12 @@ "fork_no_pids": "Aucun post sélectionné !", "fork_success": "Topic scindé !", "reputation": "Réputation", - "posts": "Messages" + "posts": "Messages", + "composer.title_placeholder": "Enter your topic title here...", + "composer.write": "Write", + "composer.preview": "Preview", + "composer.discard": "Discard", + "composer.submit": "Submit", + "composer.replying_to": "Replying to", + "composer.new_topic": "New Topic" } \ No newline at end of file diff --git a/public/language/he/topic.json b/public/language/he/topic.json index c30e374eb6..ddad8c3b58 100644 --- a/public/language/he/topic.json +++ b/public/language/he/topic.json @@ -52,5 +52,12 @@ "fork_no_pids": "לא בחרת אף פוסט!", "fork_success": "הנושא שוכפל בהצלחה!", "reputation": "מוניטין", - "posts": "פוסטים" + "posts": "פוסטים", + "composer.title_placeholder": "Enter your topic title here...", + "composer.write": "Write", + "composer.preview": "Preview", + "composer.discard": "Discard", + "composer.submit": "Submit", + "composer.replying_to": "Replying to", + "composer.new_topic": "New Topic" } \ No newline at end of file diff --git a/public/language/hu/topic.json b/public/language/hu/topic.json index e27e0ff78a..b002fb7d49 100644 --- a/public/language/hu/topic.json +++ b/public/language/hu/topic.json @@ -52,5 +52,12 @@ "fork_no_pids": "Nincs hozzászólás kiválasztva!", "fork_success": "Sikeresen szétválasztott topik!", "reputation": "Hírnév", - "posts": "Hozzászólások" + "posts": "Hozzászólások", + "composer.title_placeholder": "Enter your topic title here...", + "composer.write": "Write", + "composer.preview": "Preview", + "composer.discard": "Discard", + "composer.submit": "Submit", + "composer.replying_to": "Replying to", + "composer.new_topic": "New Topic" } \ No newline at end of file diff --git a/public/language/it/topic.json b/public/language/it/topic.json index 7b26b83790..8ecde426db 100644 --- a/public/language/it/topic.json +++ b/public/language/it/topic.json @@ -52,5 +52,12 @@ "fork_no_pids": "Nessun post selezionato!", "fork_success": "Discussione forkata con successo!", "reputation": "Reputazione", - "posts": "Post" + "posts": "Post", + "composer.title_placeholder": "Enter your topic title here...", + "composer.write": "Write", + "composer.preview": "Preview", + "composer.discard": "Discard", + "composer.submit": "Submit", + "composer.replying_to": "Replying to", + "composer.new_topic": "New Topic" } \ No newline at end of file diff --git a/public/language/nb/notifications.json b/public/language/nb/notifications.json index 9e92c5a11e..2448361f3d 100644 --- a/public/language/nb/notifications.json +++ b/public/language/nb/notifications.json @@ -1,7 +1,7 @@ { "title": "Varsler", - "no_notifs": "You have no notifications", - "see_all": "See all Notifications", + "no_notifs": "Du har ingen varsler", + "see_all": "Se alle varsler", "back_to_home": "Tilbake til NodeBB", "outgoing_link": "Utgående link", "outgoing_link_message": "Du forlatter nå", diff --git a/public/language/nb/recent.json b/public/language/nb/recent.json index 85335a6000..eb77d5d104 100644 --- a/public/language/nb/recent.json +++ b/public/language/nb/recent.json @@ -3,5 +3,5 @@ "day": "Dag", "week": "Uke", "month": "Måned", - "no_recent_topics": "There are no recent topics." + "no_recent_topics": "Det er ingen nye tråder." } \ No newline at end of file diff --git a/public/language/nb/topic.json b/public/language/nb/topic.json index 2bac937542..72cc51808b 100644 --- a/public/language/nb/topic.json +++ b/public/language/nb/topic.json @@ -2,7 +2,7 @@ "topic": "Emne", "topics": "Emner", "no_topics_found": "Ingen emner funnet!", - "no_posts_found": "No posts found!", + "no_posts_found": "Ingen innlegg funnet!", "profile": "Profil", "posted_by": "Skapt av", "chat": "Chat", @@ -19,17 +19,17 @@ "tools": "Verktøy", "flag": "Rapporter", "flag_title": "Rapporter dette innlegget for granskning", - "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", + "deleted_message": "Denne tråden har blitt slettet. Bare brukere med trådhåndterings-privilegier kan se den.", "thread_tools.title": "Trådverktøy", "thread_tools.markAsUnreadForAll": "Marker som ulest", - "thread_tools.pin": "Pin Topic", - "thread_tools.unpin": "Unpin Topic", - "thread_tools.lock": "Lock Topic", - "thread_tools.unlock": "Unlock Topic", - "thread_tools.move": "Move Topic", - "thread_tools.fork": "Fork Topic", - "thread_tools.delete": "Delete Topic", - "thread_tools.restore": "Restore Topic", + "thread_tools.pin": "Fest tråd", + "thread_tools.unpin": "Ufest tråd", + "thread_tools.lock": "Lås trid", + "thread_tools.unlock": "Lås opp tråd", + "thread_tools.move": "Flytt tråd", + "thread_tools.fork": "Forgren tråd", + "thread_tools.delete": "Slett tråd", + "thread_tools.restore": "Gjenopprett tråd", "load_categories": "Laster kategorier", "disabled_categories_note": "Deaktiverte kategorier er grået ut", "confirm_move": "Flytt", @@ -39,10 +39,10 @@ "favourites.not_logged_in.title": "Ikke logget inn", "favourites.not_logged_in.message": "Vennligst logg inn for å gjøre dette innlegget til favoritt", "favourites.has_no_favourites": "Du har ingen favoritter, marker noen innlegg som favoritt for å se dem her!", - "vote.not_logged_in.title": "Not Logged In", - "vote.not_logged_in.message": "Please log in in order to vote", - "vote.cant_vote_self.title": "Invalid Vote", - "vote.cant_vote_self.message": "You cannot vote for your own post", + "vote.not_logged_in.title": "Ikke innlogget", + "vote.not_logged_in.message": "Vennligst logg inn for å stemme", + "vote.cant_vote_self.title": "Ugyldig stemme", + "vote.cant_vote_self.message": "Du kan ikke stemme på ditt eget innlegg", "loading_more_posts": "Laster flere innlegg", "move_topic": "Flytt emne", "move_post": "Flytt innlegg", @@ -52,5 +52,12 @@ "fork_no_pids": "Ingen innlegg valgt!", "fork_success": "Innlegg ble delt!", "reputation": "Rykte", - "posts": "Innlegg" + "posts": "Innlegg", + "composer.title_placeholder": "Enter your topic title here...", + "composer.write": "Write", + "composer.preview": "Preview", + "composer.discard": "Discard", + "composer.submit": "Submit", + "composer.replying_to": "Replying to", + "composer.new_topic": "New Topic" } \ No newline at end of file diff --git a/public/language/nb/user.json b/public/language/nb/user.json index 22db5a59cc..c0c83ea2ac 100644 --- a/public/language/nb/user.json +++ b/public/language/nb/user.json @@ -9,7 +9,7 @@ "age": "Alder", "joined": "Ble med", "lastonline": "Senest online", - "profile": "Profile", + "profile": "Profil", "profile_views": "Profilvisninger", "reputation": "Rykte", "posts": "Innlegg", @@ -33,7 +33,7 @@ "show_email": "Vis min e-post", "has_no_follower": "Denne brukeren har ingen følgere :(", "follows_no_one": "Denne brukeren følger ingen :(", - "has_no_posts": "This user didn't post anything yet.", + "has_no_posts": "Denne brukeren har ikke skrevet noe enda.", "email_hidden": "E-post skjult", "hidden": "skjult" } \ No newline at end of file diff --git a/public/language/pt_BR/topic.json b/public/language/pt_BR/topic.json index 8717077d6a..e0a285200e 100644 --- a/public/language/pt_BR/topic.json +++ b/public/language/pt_BR/topic.json @@ -52,5 +52,12 @@ "fork_no_pids": "Nenhum post selecionado", "fork_success": "Fork realizado com sucesso!", "reputation": "Reputação", - "posts": "Posts" + "posts": "Posts", + "composer.title_placeholder": "Enter your topic title here...", + "composer.write": "Write", + "composer.preview": "Preview", + "composer.discard": "Discard", + "composer.submit": "Submit", + "composer.replying_to": "Replying to", + "composer.new_topic": "New Topic" } \ No newline at end of file diff --git a/public/language/ru/topic.json b/public/language/ru/topic.json index 2947b2c4bb..bcc2c10538 100644 --- a/public/language/ru/topic.json +++ b/public/language/ru/topic.json @@ -52,5 +52,12 @@ "fork_no_pids": "Сообщения не отмечены!", "fork_success": "Ответвление темы создано!", "reputation": "Репутация", - "posts": "Сообщений" + "posts": "Сообщений", + "composer.title_placeholder": "Enter your topic title here...", + "composer.write": "Write", + "composer.preview": "Preview", + "composer.discard": "Discard", + "composer.submit": "Submit", + "composer.replying_to": "Replying to", + "composer.new_topic": "New Topic" } \ No newline at end of file diff --git a/public/language/sk/topic.json b/public/language/sk/topic.json index b87645274e..9806917cfe 100644 --- a/public/language/sk/topic.json +++ b/public/language/sk/topic.json @@ -52,5 +52,12 @@ "fork_no_pids": "Žiadne príspevky neboli vybrané!", "fork_success": "Téma bola úspešne rozdelená!", "reputation": "Reputácia", - "posts": "Príspevky" + "posts": "Príspevky", + "composer.title_placeholder": "Enter your topic title here...", + "composer.write": "Write", + "composer.preview": "Preview", + "composer.discard": "Discard", + "composer.submit": "Submit", + "composer.replying_to": "Replying to", + "composer.new_topic": "New Topic" } \ No newline at end of file diff --git a/public/language/sv/topic.json b/public/language/sv/topic.json index 2791b14e6c..7dde352dbf 100644 --- a/public/language/sv/topic.json +++ b/public/language/sv/topic.json @@ -52,5 +52,12 @@ "fork_no_pids": "Inga inlägg valda!", "fork_success": "Grening av inlägg lyckad!", "reputation": "Rykte", - "posts": "Inlägg" + "posts": "Inlägg", + "composer.title_placeholder": "Enter your topic title here...", + "composer.write": "Write", + "composer.preview": "Preview", + "composer.discard": "Discard", + "composer.submit": "Submit", + "composer.replying_to": "Replying to", + "composer.new_topic": "New Topic" } \ No newline at end of file diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json index fb293ec66f..5156b0b271 100644 --- a/public/language/tr/topic.json +++ b/public/language/tr/topic.json @@ -52,5 +52,12 @@ "fork_no_pids": "Hiç bir ileti seçilmedi!", "fork_success": "Succesfully forked topic!", "reputation": "Saygınlık", - "posts": "İletiler" + "posts": "İletiler", + "composer.title_placeholder": "Enter your topic title here...", + "composer.write": "Write", + "composer.preview": "Preview", + "composer.discard": "Discard", + "composer.submit": "Submit", + "composer.replying_to": "Replying to", + "composer.new_topic": "New Topic" } \ No newline at end of file diff --git a/public/language/zh_CN/topic.json b/public/language/zh_CN/topic.json index 6b78645c54..d2b99ed8c5 100644 --- a/public/language/zh_CN/topic.json +++ b/public/language/zh_CN/topic.json @@ -52,5 +52,12 @@ "fork_no_pids": "尚未选择帖子！", "fork_success": "成功将帖子作为主题！", "reputation": "声望", - "posts": "发帖数" + "posts": "发帖数", + "composer.title_placeholder": "Enter your topic title here...", + "composer.write": "Write", + "composer.preview": "Preview", + "composer.discard": "Discard", + "composer.submit": "Submit", + "composer.replying_to": "Replying to", + "composer.new_topic": "New Topic" } \ No newline at end of file diff --git a/public/language/zh_TW/topic.json b/public/language/zh_TW/topic.json index ccfab49a41..7d353e102f 100644 --- a/public/language/zh_TW/topic.json +++ b/public/language/zh_TW/topic.json @@ -52,5 +52,12 @@ "fork_no_pids": "尚未選擇帖子！", "fork_success": "成功將帖子作為主題！", "reputation": "聲望", - "posts": "發帖數" + "posts": "發帖數", + "composer.title_placeholder": "Enter your topic title here...", + "composer.write": "Write", + "composer.preview": "Preview", + "composer.discard": "Discard", + "composer.submit": "Submit", + "composer.replying_to": "Replying to", + "composer.new_topic": "New Topic" } \ No newline at end of file From 83a201acce9459822cff1f4aaea4a0ccf7f01581 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 10 Feb 2014 13:55:42 -0500 Subject: [PATCH 09/10] closes #918 --- public/src/forum/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/forum/search.js b/public/src/forum/search.js index 08bad46056..71ed19b69f 100644 --- a/public/src/forum/search.js +++ b/public/src/forum/search.js @@ -4,7 +4,7 @@ define(function() { Search.init = function() { var searchQuery = $('#topic-results').attr('data-search-query'); $('.search-result-text').children().each(function() { - var text = $(this).html(); + var text = $(this).text(); var regex = new RegExp(searchQuery, 'gi'); text = text.replace(regex, '' + searchQuery + ''); $(this).html(text); From 8c2611aeb5037535cc55a0ae884f2a8cfc0fbc4b Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 10 Feb 2014 14:05:09 -0500 Subject: [PATCH 10/10] potentially fixes #823 --- public/src/app.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/public/src/app.js b/public/src/app.js index 7f79031b20..dd738fe8eb 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -444,7 +444,11 @@ var socket, clearInterval(titleObj.interval); } titleObj.interval = setInterval(function() { - window.document.title = titleObj.titles[titleObj.titles.indexOf(window.document.title) ^ 1]; + var title = titleObj.titles[titleObj.titles.indexOf(window.document.title) ^ 1]; + + if (title) { + window.document.title = title; + } }, 2000); } else { if (titleObj.interval) {