From 36bc2967c27c2ecb845ccb1d5ad2f8dd1c48ad9d Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Tue, 25 Feb 2014 22:05:07 -0500 Subject: [PATCH 01/19] fix highlight on vanilla, dont replaceState if url didnt change --- public/src/forum/topic.js | 25 +++++++++++++++---------- public/templates/topic.tpl | 2 +- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js index 68c6a12471..f10839ec0e 100644 --- a/public/src/forum/topic.js +++ b/public/src/forum/topic.js @@ -1,7 +1,8 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { var Topic = {}, infiniteLoaderActive = false, - scrollingToPost = false; + scrollingToPost = false, + currentUrl = ''; function showBottomPostBar() { if($('#post-container .post-row').length > 1 || !$('#post-container li[data-index="0"]').length) { @@ -1020,6 +1021,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { $('.posts > .post-row').each(function() { var el = $(this); + if (elementInView(el)) { var index = parseInt(el.attr('data-index'), 10) + 1; if(index === 0) { @@ -1028,13 +1030,16 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { localStorage.setItem("topic:" + templates.get('topic_id') + ":bookmark", el.attr('data-pid')); if (!scrollingToPost) { - if (history.replaceState) { - history.replaceState({ - url: window.location.pathname.slice(1) + '#' + el.attr('data-pid') - }, null, - window.location.protocol + '//' + window.location.host + window.location.pathname + '#' + el.attr('data-pid')); - } else { - location.hash = '#' + el.attr('data-pid'); + var newUrl = window.location.protocol + '//' + window.location.host + window.location.pathname + '#' + el.attr('data-pid') + if (newUrl !== currentUrl) { + if (history.replaceState) { + history.replaceState({ + url: window.location.pathname.slice(1) + '#' + el.attr('data-pid') + }, null, newUrl); + } else { + location.hash = '#' + el.attr('data-pid'); + } + currentUrl = newUrl; } } } @@ -1105,9 +1110,9 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { }, duration !== undefined ? duration : 400, function() { scrollingToPost = false; if (highlight) { - scrollTo.parent().addClass('highlight'); + scrollTo.parent().find('.topic-item').addClass('highlight'); setTimeout(function() { - scrollTo.parent().removeClass('highlight'); + scrollTo.parent().find('.topic-item').removeClass('highlight'); }, 5000); } }); diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl index 9dcc7c8b3f..ef0d794d88 100644 --- a/public/templates/topic.tpl +++ b/public/templates/topic.tpl @@ -38,7 +38,7 @@ -
+
From 3f7e458866f05a8014ff2adcf47d2a3a02558e14 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 25 Feb 2014 23:06:21 -0500 Subject: [PATCH 02/19] fixed #1127 --- src/routes/meta.js | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/src/routes/meta.js b/src/routes/meta.js index ed8ac3a559..0900ca07d8 100644 --- a/src/routes/meta.js +++ b/src/routes/meta.js @@ -16,7 +16,7 @@ var path = require('path'), db.getObjectFields('config', ['theme:type', 'theme:id'], function(err, themeData) { var themeId = (themeData['theme:id'] || 'nodebb-theme-vanilla'), - baseThemePath = path.join(nconf.get('themes_path'), themeId), + baseThemePath = path.join(nconf.get('themes_path'), (themeData['theme:type'] && themeData['theme:type'] === 'local' ? themeId : 'nodebb-theme-vanilla')), paths = [baseThemePath, path.join(__dirname, '../../node_modules')], source = '@import "./theme";', x, numLESS; @@ -26,28 +26,21 @@ var path = require('path'), source += '\n@import "./' + plugins.lessFiles[x] + '";'; } - // Detect if a theme has been selected, and handle appropriately - if (!themeData['theme:type'] || themeData['theme:type'] === 'local') { - // Local theme - var parser = new (less.Parser)({ - paths: paths - }); + var parser = new (less.Parser)({ + paths: paths + }); - parser.parse(source, function(err, tree) { - if (err) { - res.send(500, err.message); - return; - } + parser.parse(source, function(err, tree) { + if (err) { + res.send(500, err.message); + return; + } - meta.css.cache = tree.toCSS({ - compress: true - }); - res.type('text/css').send(200, meta.css.cache); + meta.css.cache = tree.toCSS({ + compress: true }); - } else { - // Bootswatch theme not supported yet - res.send(500, 'Give me time!'); - } + res.type('text/css').send(200, meta.css.cache); + }); }); }); From 8a2266816d3b20eadf5b197b99cf389e03a7b996 Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Wed, 26 Feb 2014 13:14:48 -0500 Subject: [PATCH 03/19] make plugin names strong --- public/templates/admin/plugins.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/templates/admin/plugins.tpl b/public/templates/admin/plugins.tpl index 3aa7e5f5e1..dd69ffa721 100644 --- a/public/templates/admin/plugins.tpl +++ b/public/templates/admin/plugins.tpl @@ -12,7 +12,7 @@
  • -

    {plugins.name}

    +

    {plugins.name}

    From 7b46d66e681f79f99b23dd92985864268a2baca2 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 26 Feb 2014 13:42:39 -0500 Subject: [PATCH 04/19] having the loader play nicely with supervisor -- ./nodebb watch can now hit the restart button --- loader.js | 11 +++++++++-- nodebb | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/loader.js b/loader.js index 63027b1603..2263955ef9 100644 --- a/loader.js +++ b/loader.js @@ -1,6 +1,6 @@ var fork = require('child_process').fork, start = function() { - var nbb = fork('./app', process.argv.slice(2), { + nbb = fork('./app', process.argv.slice(2), { env: { 'NODE_ENV': process.env.NODE_ENV } @@ -14,6 +14,13 @@ var fork = require('child_process').fork, nbb.kill(); } }); - } + }, + stop = function() { + nbb.kill(); + }, + nbb; + +process.on('SIGINT', stop); +process.on('SIGTERM', stop); start(); \ No newline at end of file diff --git a/nodebb b/nodebb index cdefacd524..0ea67b0a69 100755 --- a/nodebb +++ b/nodebb @@ -37,7 +37,7 @@ case "$1" in echo "Launching NodeBB in \"development\" mode." echo "To run the production build of NodeBB, please use \"forever\"." echo "More Information: https://github.com/designcreateplay/NodeBB/wiki/How-to-run-NodeBB" - NODE_ENV=development supervisor -q --extensions 'node|js|tpl' -- app "$@" + NODE_ENV=development supervisor -q --extensions 'node|js|tpl' -- loader "$@" ;; *) From c38e328377901027b67e8df805a6cbdc829bc15e Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 26 Feb 2014 14:50:44 -0500 Subject: [PATCH 05/19] language files for fi, it, zh_CN, pl, hu --- public/language/fi/category.json | 6 +- public/language/fi/footer.json | 2 +- public/language/fi/global.json | 68 ++++++++--------- public/language/fi/login.json | 8 +- public/language/fi/modules.json | 6 +- public/language/fi/notifications.json | 6 +- public/language/fi/pages.json | 22 +++--- public/language/fi/recent.json | 4 +- public/language/fi/register.json | 20 ++--- public/language/fi/reset_password.json | 10 +-- public/language/fi/topic.json | 94 +++++++++++++----------- public/language/fi/unread.json | 4 +- public/language/fi/user.json | 48 ++++++------ public/language/fi/users.json | 6 +- public/language/hu/topic.json | 12 ++- public/language/it/category.json | 8 +- public/language/it/footer.json | 2 +- public/language/it/global.json | 56 +++++++------- public/language/it/language.json | 2 +- public/language/it/login.json | 8 +- public/language/it/modules.json | 4 +- public/language/it/notifications.json | 6 +- public/language/it/pages.json | 20 ++--- public/language/it/recent.json | 4 +- public/language/it/register.json | 4 +- public/language/it/reset_password.json | 4 +- public/language/it/topic.json | 86 ++++++++++++---------- public/language/it/unread.json | 2 +- public/language/it/user.json | 26 +++---- public/language/it/users.json | 2 +- public/language/pl/global.json | 2 + public/language/pl/pages.json | 2 +- public/language/pl/topic.json | 10 ++- public/language/zh_CN/global.json | 60 +++++++-------- public/language/zh_CN/notifications.json | 8 +- public/language/zh_CN/pages.json | 22 +++--- public/language/zh_CN/recent.json | 4 +- public/language/zh_CN/register.json | 6 +- public/language/zh_CN/topic.json | 68 +++++++++-------- public/language/zh_CN/unread.json | 2 +- 40 files changed, 391 insertions(+), 343 deletions(-) diff --git a/public/language/fi/category.json b/public/language/fi/category.json index 6671ce4b16..3512fae9d5 100644 --- a/public/language/fi/category.json +++ b/public/language/fi/category.json @@ -1,12 +1,12 @@ { - "new_topic_button": "Aloita uusi keskustelu.", - "no_topics": "Tällä aihealueella ei ole yhtään viestiketjua.
    Miksi et aloittaisi yhtä?", + "new_topic_button": "Uusi aihe", + "no_topics": "Tällä aihealueella ei ole yhtään aihetta.
    Miksi et aloittaisi uutta?", "sidebar.recent_replies": "Viimeisimmät vastaukset", "sidebar.active_participants": "Aktiiviset keskustelijat", "sidebar.moderators": "Moderaattorit", "posts": "viestit", "views": "katsottu", - "posted": "lähetetty", + "posted": "kirjoitettu", "browsing": "selaamassa", "no_replies": "Kukaan ei ole vastannut", "replied": "vastasi", diff --git a/public/language/fi/footer.json b/public/language/fi/footer.json index 422d32464a..46ffa8334d 100644 --- a/public/language/fi/footer.json +++ b/public/language/fi/footer.json @@ -1,7 +1,7 @@ { "stats.online": "Online", "stats.users": "Käyttäjää", - "stats.topics": "Viestiketjua", + "stats.topics": "Aihetta", "stats.posts": "Viestiä", "success": "onnistunut" } \ No newline at end of file diff --git a/public/language/fi/global.json b/public/language/fi/global.json index b276cf767e..b5d7aab994 100644 --- a/public/language/fi/global.json +++ b/public/language/fi/global.json @@ -1,56 +1,58 @@ { "home": "Etusivu", - "search": "Etsi", + "search": "Hae", "buttons.close": "Sulje", "403.title": "Pääsy kielletty", - "403.message": "Olet päätynyt sivulle jolle sinulla ei ole tarvittavia oikeuksia. Ehkäpä sinun tulisi     kirjaudu sisään?", - "404.title": "Sivua ei löydy", - "404.message": "Olet päätynyt sivulle jota ei ole olemassa. Palaa etusivulle.", + "403.message": "Olet päätynyt sivulle, johon sinulla ei ole tarvittavia oikeuksia. Sinun pitäisi kai kirjautua sisään.", + "404.title": "Ei löydy", + "404.message": "Olet päätynyt sivulle, jota ei ole olemassa. Palaa etusivulle.", "500.title": "Sisäinen virhe.", "500.message": "Oho! Jotain meni pieleen!", "register": "Rekisteröidy", "login": "Kirjaudu", - "welcome_back": "Welcome Back ", - "you_have_successfully_logged_in": "You have successfully logged in", + "please_log_in": "Kirjaudu, ole hyvä", + "posting_restriction_info": "Kirjoittaminen on tällä hetkellä rajattu vain rekisteröityneille käyttäjille. Napsauta tätä kirjautuaksesi.", + "welcome_back": "Tervetuloa takaisin", + "you_have_successfully_logged_in": "Olet onnistuneesti kirjautunut sisään", "logout": "Kirjaudu ulos", - "logout.title": "Olet nyt kirjaunut ulos.", + "logout.title": "Olet nyt kirjautunut ulos.", "logout.message": "Olet onnistuneesti kirjautunut ulos NodeBB:stä", "save_changes": "Tallenna muutokset", "close": "Sulje", - "pagination": "Pagination", - "header.admin": "Admin", + "pagination": "Sivutus", + "header.admin": "Ylläpitäjä", "header.recent": "Viimeisimmät", "header.unread": "Lukemattomat", - "header.popular": "Popular", + "header.popular": "Suositut", "header.users": "Käyttäjät", - "header.chats": "Chats", - "header.notifications": "Notifications", - "header.search": "Etsi", + "header.chats": "Keskustelut", + "header.notifications": "Ilmoitukset", + "header.search": "Hae", "header.profile": "Profiili", - "notifications.loading": "Ladataan ilmoituksia.", + "notifications.loading": "Ladataan ilmoituksia", "chats.loading": "Ladataan keskusteluja", - "motd.welcome": "Tervetuloa NodeBB:n, tulevaisuuden keskustelualustalle.", + "motd.welcome": "Tervetuloa NodeBB:hen, tulevaisuuden keskustelualustalle.", "motd.get": "Hanki NodeBB", - "motd.fork": "Fork", + "motd.fork": "Forkkaa", "motd.like": "Tykkää", "motd.follow": "Seuraa", - "previouspage": "Previous Page", - "nextpage": "Next Page", - "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", + "previouspage": "Edellinen sivu", + "nextpage": "Seuraava sivu", + "alert.success": "Onnistui", + "alert.error": "Virhe", + "alert.banned": "Estetty", + "alert.banned.message": "Sinut on estetty ja kirjaudut ulos!", + "alert.unfollow": "Et seuraa enää %1!", + "alert.follow": "Seuraat nyt %1!", + "posts": "Viestit", + "views": "Katsottu", + "posted": "kirjoitettu", + "in": "alueelle", + "recentposts": "Viimeisimmät viestit", "online": "Online", - "away": "Away", - "dnd": "Do not Disturb", - "invisible": "Invisible", + "away": "Poissa", + "dnd": "Älä häiritse", + "invisible": "Näkymätön", "offline": "Offline", - "privacy": "Privacy" + "privacy": "Yksityisyys" } \ No newline at end of file diff --git a/public/language/fi/login.json b/public/language/fi/login.json index 2d43168d30..5d1a2eb3cd 100644 --- a/public/language/fi/login.json +++ b/public/language/fi/login.json @@ -1,10 +1,10 @@ { "login": "Kirjaudu sisään", - "username": "Käyttäjän nimi", + "username": "Käyttäjänimi", "password": "Salasana", "remember_me": "Muista minut?", - "forgot_password": "Unohtuiko salasana?", - "alternative_logins": "Vaihtoehtoiset sisäänkirjaantumistavat", - "failed_login_attempt": "Sisäänkirjaantuminen epäonnistui, ole hyvä ja yritä uudestaan.", + "forgot_password": "Unohditko salasanasi?", + "alternative_logins": "Vaihtoehtoiset kirjautumistavat", + "failed_login_attempt": "Kirjautumisyritys epäonnistui, ole hyvä ja yritä uudestaan.", "login_successful": "Olet onnistuneesti kirjautunut sisään!" } \ No newline at end of file diff --git a/public/language/fi/modules.json b/public/language/fi/modules.json index 612822916a..f1c0a0ee82 100644 --- a/public/language/fi/modules.json +++ b/public/language/fi/modules.json @@ -1,6 +1,6 @@ { - "chat.chatting_with": "Juttele kanssa", - "chat.placeholder": "kirjoita viestisi tähän, paina enter lähettääksesi", + "chat.chatting_with": "Keskustele käyttäjän kanssa", + "chat.placeholder": "kirjoita viestisi tähän ja paina enter lähettääksesi", "chat.send": "Lähetä", - "chat.no_active": "Sinulla ei ole aktiivisiä keskusteluita." + "chat.no_active": "Sinulla ei ole aktiivisia keskusteluita." } \ No newline at end of file diff --git a/public/language/fi/notifications.json b/public/language/fi/notifications.json index 469763bde0..9d7f5fbdfc 100644 --- a/public/language/fi/notifications.json +++ b/public/language/fi/notifications.json @@ -1,8 +1,8 @@ { "title": "Ilmoitukset", - "no_notifs": "You have no new notifications", - "see_all": "See all Notifications", - "back_to_home": "Takaisin NodeBB:n", + "no_notifs": "Sinulla ei ole uusia ilmoituksia", + "see_all": "Katso kaikki ilmoitukset", + "back_to_home": "Takaisin NodeBB:hen", "outgoing_link": "Ulkopuolinen linkki", "outgoing_link_message": "Olet nyt poistumassa", "continue_to": "Jatka", diff --git a/public/language/fi/pages.json b/public/language/fi/pages.json index d60e0a0a9b..49a7dca36a 100644 --- a/public/language/fi/pages.json +++ b/public/language/fi/pages.json @@ -1,13 +1,13 @@ { - "home": "Home", - "unread": "Unread Topics", - "popular": "Popular Topics", - "recent": "Recent Topics", - "users": "Registered Users", - "notifications": "Notifications", - "user.edit": "Editing \"%1\"", - "user.following": "People %1 Follows", - "user.followers": "People who Follow %1", - "user.favourites": "%1's Favourite Posts", - "user.settings": "User Settings" + "home": "Etusivu", + "unread": "Lukemattomat aiheet", + "popular": "Suositut aiheet", + "recent": "Viimeisimmät aiheet", + "users": "Rekisteröityneet käyttäjät", + "notifications": "Ilmoitukset", + "user.edit": "Muokataan \"%1\"", + "user.following": "Käyttäjät, joita %1 seuraa", + "user.followers": "Käyttäjät, jotka seuraavat käyttäjää %1", + "user.favourites": "Käyttäjän %1 suosikkiviestit", + "user.settings": "Käyttäjän asetukset" } \ No newline at end of file diff --git a/public/language/fi/recent.json b/public/language/fi/recent.json index 314fadb2e1..585a326219 100644 --- a/public/language/fi/recent.json +++ b/public/language/fi/recent.json @@ -1,7 +1,7 @@ { - "title": "Recent", + "title": "Viimeisimmät", "day": "Päivä", "week": "Viikko", "month": "Kuukausi", - "no_recent_topics": "There are no recent topics." + "no_recent_topics": "Ei viimeisimpiä aiheita." } \ No newline at end of file diff --git a/public/language/fi/register.json b/public/language/fi/register.json index ef0017e5a1..a07f0d311e 100644 --- a/public/language/fi/register.json +++ b/public/language/fi/register.json @@ -1,18 +1,18 @@ { "register": "Rekisteröidy", - "help.email": "Oletuksena sähköposti osoitettasi ei näytetä muille .", - "help.username_restrictions": "Yksilöllinen käyttäjänimi, pitää olla %1 - %2 merkkiä pitkä. Toiset voivat mainita sinut @käyttäjänimi.", + "help.email": "Oletuksena sähköpostiosoitettasi ei näytetä muille.", + "help.username_restrictions": "Yksilöllisen käyttäjätunnuksen pitää olla %1-%2 merkkiä pitkä. Toiset voivat mainita sinut @username.", "help.minimum_password_length": "Salasanasi pitää olla vähintään %1 merkin mittainen.", - "email_address": "Sähköposti", - "email_address_placeholder": "Anna sähköpostiosoitteesi", - "username": "Käyttäjänimi", - "username_placeholder": "Syötä käyttäjänimesi", + "email_address": "Sähköpostiosoite", + "email_address_placeholder": "Syötä sähköpostiosoitteesi", + "username": "Käyttäjätunnus", + "username_placeholder": "Syötä käyttäjätunnuksesi", "password": "Salasana", "password_placeholder": "Syötä salasanasi", - "confirm_password": "Vahvista salasana", - "confirm_password_placeholder": "Vahvista salasana", + "confirm_password": "Vahvista salasanasi", + "confirm_password_placeholder": "Vahvista salasanasi", "register_now_button": "Rekisteröidy nyt", "alternative_registration": "Vaihtoehtoiset rekisteröitymistavat", - "terms_of_use": "Terms of Use", - "agree_to_terms_of_use": "I agree to the Terms of Use" + "terms_of_use": "Käyttöehdot", + "agree_to_terms_of_use": "Hyväksyn käyttöehdot" } \ No newline at end of file diff --git a/public/language/fi/reset_password.json b/public/language/fi/reset_password.json index 114bbab8d5..864817f60d 100644 --- a/public/language/fi/reset_password.json +++ b/public/language/fi/reset_password.json @@ -2,12 +2,12 @@ "reset_password": "Palauta salasana", "update_password": "Päivitä salasana", "password_changed.title": "Salasana muutettu", - "password_changed.message": "

    Salasana palautettu onnistunesti, ole hyvä ja kirjaudu sisään uudestaan..", + "password_changed.message": "

    Salasanasi on palautettu onnistuneesti, ole hyvä ja kirjaudu uudestaan.", "wrong_reset_code.title": "Väärä palautuskoodi", - "wrong_reset_code.message": "Annettu palautuskoodi oli väärä. Ole hyvä yritä uudelleen, tai pyydä uutta palautuskoodia.", + "wrong_reset_code.message": "Annettu palautuskoodi oli väärä. Ole hyvä ja yritä uudelleen tai pyydä uutta palautuskoodia.", "new_password": "Uusi salasana", "repeat_password": "Vahvista salasana", - "enter_email": "Syötä sähköpostiosoitteesi niin me lähetämänne Sinulle ohjeet kuinka voit palauttaa käyttäjätilisi.", - "password_reset_sent": "Salasanan palautus lähetetty", - "invalid_email": "Väärä sähköpostiosoite / Sähköpostiosoitetta ei ole!" + "enter_email": "Syötä sähköpostiosoitteesi, niin me lähetämme sinulle sähköpostilla ohjeet käyttäjätilisi palauttamiseksi.", + "password_reset_sent": "Salasanan palautuskoodi lähetetty", + "invalid_email": "Virheellinen sähköpostiosoite / Sähköpostiosoitetta ei ole olemassa!" } \ No newline at end of file diff --git a/public/language/fi/topic.json b/public/language/fi/topic.json index 2cacaba33d..c7dcff3a0f 100644 --- a/public/language/fi/topic.json +++ b/public/language/fi/topic.json @@ -1,65 +1,73 @@ { - "topic": "Keskustelu", - "topics": "Keskustelut", - "no_topics_found": "Keskusteluja ei löytynyt!", - "no_posts_found": "No posts found!", + "topic": "Aihe", + "topics": "Aiheet", + "no_topics_found": "Aiheita ei löytynyt!", + "no_posts_found": "Viestejä ei löytynyt!", "profile": "Profiili", - "posted_by": "Posted by", - "chat": "Juttele", - "notify_me": "Ilmoita uusista viesteistä tässä keskustelussa", + "posted_by": "Kirjoittanut", + "chat": "Keskustele", + "notify_me": "Ilmoita, kun tähän keskusteluun tulee uusia viestejä", "quote": "Lainaa", "reply": "Vastaa", "edit": "Muokkaa", "delete": "Poista", "move": "Siirrä", "fork": "Haaroita", - "banned": "banned", - "link": "Linkkaa", + "banned": "estetty", + "link": "Linkitä", "share": "Jaa", "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.", - "watch": "Watch", - "share_this_post": "Share this Post", - "thread_tools.title": "Ketjun työkalut", - "thread_tools.markAsUnreadForAll": "Merkitse luetuiksi", - "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", + "flag": "Ilmianna", + "flag_title": "Ilmianna tämä viesti moderaattoreille", + "deleted_message": "Tämä viestiketju on poistettu. Vain käyttäjät, joilla on viestiketjujen hallintaoikeudet, voivat nähdä sen.", + "following_topic.title": "Seurataan aihetta", + "following_topic.message": "Saat nyt ilmoituksen, kun joku kirjoittaa tähän aiheeseen.", + "not_following_topic.title": "Et seuraa aihetta", + "not_following_topic.message": "Et saa enää ilmoituksia tästä aiheesta.", + "login_to_subscribe": "Ole hyvä ja rekisteröidy tai kirjaudu sisään tilataksesi tämän aiheen", + "watch": "Tarkkaile", + "share_this_post": "Jaa tämä viesti", + "thread_tools.title": "Aiheen työkalut", + "thread_tools.markAsUnreadForAll": "Merkitse lukemattomaksi", + "thread_tools.pin": "Kiinnitä aihe", + "thread_tools.unpin": "Poista aiheen kiinnitys", + "thread_tools.lock": "Lukitse aihe", + "thread_tools.unlock": "Poista aiheen lukitus", + "thread_tools.move": "Siirrä aihe", + "thread_tools.fork": "Haaroita aihe", + "thread_tools.delete": "Poista aihe", + "thread_tools.restore": "Palauta aihe", "load_categories": "Ladataan aihealueita", - "disabled_categories_note": "Käytöstä poistetut aihealueetta ovat harmaina", + "disabled_categories_note": "Käytöstä poistetut aihealueet ovat harmaina", "confirm_move": "Siirrä", "confirm_fork": "Haaroita", - "favourite": "Suosikki", + "favourite": "Lisää suosikiksi", "favourites": "Suosikit", - "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", + "favourites.not_logged_in.title": "Et ole kirjautunut", + "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ä. Lisää joitakin viestejä suosikeiksi nähdäksesi ne täällä!", + "vote.not_logged_in.title": "Et ole kirjautunut", + "vote.not_logged_in.message": "Kirjaudu sisään äänestääksesi", + "vote.cant_vote_self.title": "Virheellinen ääni", + "vote.cant_vote_self.message": "Et voi äänestää omaa viestiäsi", "loading_more_posts": "Ladataan lisää viestejä", - "move_topic": "Siirrä keskustelu", + "move_topic": "Siirrä aihe", "move_post": "Siirrä viesti", "fork_topic": "Haaroita keskustelu", - "topic_will_be_moved_to": "Tämä keskustelu siirretään aihealueelle ", - "fork_topic_instruction": "Klikkaa viestejä jotka haluat haaroittaa", + "topic_will_be_moved_to": "Tämä keskustelu siirretään aihealueelle", + "fork_topic_instruction": "Napsauta viestejä, jotka haluat haaroittaa", "fork_no_pids": "Ei valittuja viestejä!", "fork_success": "Keskustelu haaroitettu onnistuneesti!", "reputation": "Maine", "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" + "composer.title_placeholder": "Syötä aiheesi otsikko tähän...", + "composer.write": "Kirjoita", + "composer.preview": "Esikatsele", + "composer.discard": "Hylkää", + "composer.submit": "Lähetä", + "composer.replying_to": "Vastataan aiheeseen", + "composer.new_topic": "Uusi aihe", + "composer.drag_and_drop_images": "Vedä ja pudota kuvat tähän", + "composer.content_is_parsed_with": "Sisältö jäsennetään muodossa", + "composer.upload_instructions": "Lataa kuvia vetämällä & pudottamalla ne." } \ No newline at end of file diff --git a/public/language/fi/unread.json b/public/language/fi/unread.json index 0a84b410c7..928290c7ce 100644 --- a/public/language/fi/unread.json +++ b/public/language/fi/unread.json @@ -1,6 +1,6 @@ { - "title": "Unread", - "no_unread_topics": "Ei lukemattomia keskusteluja.", + "title": "Lukematon", + "no_unread_topics": "Ei lukemattomia aiheita.", "mark_all_read": "Merkitse kaikki luetuiksi", "load_more": "Lataa lisää" } \ No newline at end of file diff --git a/public/language/fi/user.json b/public/language/fi/user.json index 82c0228b33..5020e50f76 100644 --- a/public/language/fi/user.json +++ b/public/language/fi/user.json @@ -1,47 +1,47 @@ { - "banned": "Porttikiellossa", + "banned": "Bannattu", "offline": "Offline", "username": "Käyttäjän nimi", "email": "Sähköposti", - "fullname": "Kokonimi", + "fullname": "Koko nimi", "website": "Kotisivu", "location": "Sijainti", "age": "Ikä", "joined": "Liittynyt", "lastonline": "Viimeksi online", - "profile": "Profile", - "profile_views": "Profiilin katselukerrat", + "profile": "Profiili", + "profile_views": "Profiilia katsottu", "reputation": "Maine", "posts": "Viestit", - "favourites": "Favourites", + "favourites": "Suosikit", "followers": "Seuraajat", - "following": "Seuraa", + "following": "Seuratut", "signature": "Allekirjoitus", "gravatar": "Gravatar", "birthday": "Syntymäpäivä", - "chat": "Chat", - "follow": "Follow", - "unfollow": "Unfollow", - "change_picture": "Vaihda kuvaa", + "chat": "Keskustele", + "follow": "Seuraa", + "unfollow": "Älä seuraa", + "change_picture": "Vaihda kuva", "edit": "Muokkaa", - "uploaded_picture": "Siirretty kuva", - "upload_new_picture": "Siirrä uusi kuva", - "current_password": "Current Password", - "change_password": "Vaihda salasanaa", - "confirm_password": "Vahvista salasanaa", + "uploaded_picture": "Ladattu kuva", + "upload_new_picture": "Lataa uusi kuva", + "current_password": "Nykyinen salasana", + "change_password": "Vaihda salasana", + "confirm_password": "Vahvista salasana", "password": "Salasana", - "upload_picture": "Siirrä kuva", - "upload_a_picture": "Siirrä kuva", - "image_spec": "You may only upload PNG, JPG, or GIF files", + "upload_picture": "Lataa kuva", + "upload_a_picture": "Lataa kuva", + "image_spec": "Voit ladata vain PNG-, JPG- tai GIF-tiedostoja", "max": "max.", - "settings": "Settings", + "settings": "Asetukset", "show_email": "Näytä sähköpostiosoitteeni", - "has_no_follower": "Tällä käyttäjällä ei ole yhtään seuraaja :(", + "has_no_follower": "Kukaan ei seuraa tätä käyttäjää :(", "follows_no_one": "Tämä käyttäjä ei seuraa ketään :(", - "has_no_posts": "This user didn't post anything yet.", + "has_no_posts": "Tämä käyttäjä ei ole kirjoittanut vielä mitään.", "email_hidden": "Sähköposti piilotettu", "hidden": "piilotettu", - "paginate_description": "Paginate topics and posts instead of using infinite scroll.", - "topics_per_page": "Topics per Page", - "posts_per_page": "Posts per Page" + "paginate_description": "Sivuta aiheet ja viestit loputtoman vierittämisen sijaan.", + "topics_per_page": "Aihetta per sivu", + "posts_per_page": "Viestiä per sivu" } \ No newline at end of file diff --git a/public/language/fi/users.json b/public/language/fi/users.json index d5f2b46a69..e7d3520a13 100644 --- a/public/language/fi/users.json +++ b/public/language/fi/users.json @@ -1,9 +1,9 @@ { - "latest_users": "Viimeisimmät Käyttäjät", + "latest_users": "Viimeisimmät käyttäjät", "top_posters": "Aktiivisimmat viestittelijät", "most_reputation": "Eniten mainetta", "online": "Online", - "search": "Etsi", - "enter_username": "Syötä käyttäjänimi etsiäksesi", + "search": "Hae", + "enter_username": "Syötä käyttäjätunnus hakeaksesi", "load_more": "Lataa lisää" } \ No newline at end of file diff --git a/public/language/hu/topic.json b/public/language/hu/topic.json index 64608fd052..0e64a57877 100644 --- a/public/language/hu/topic.json +++ b/public/language/hu/topic.json @@ -20,6 +20,11 @@ "flag": "Jelentés", "flag_title": "A hozzászólás jelentése a moderátoroknál", "deleted_message": "Ez a topik törölve lett. Kizárólag azok a felhasználók láthatják, akiknek joga van hozzá.", + "following_topic.title": "Following Topic", + "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.", + "not_following_topic.title": "Not Following Topic", + "not_following_topic.message": "You will no longer receive notifications from this topic.", + "login_to_subscribe": "Please register or log in in order to subscribe to this topic", "watch": "Watch", "share_this_post": "Share this Post", "thread_tools.title": "Téma Eszközök", @@ -57,9 +62,12 @@ "posts": "Hozzászólás", "composer.title_placeholder": "Írd be a témanevet...", "composer.write": "Ír", - "composer.preview": "Előzénet", + "composer.preview": "Előnézet", "composer.discard": "Elvet", "composer.submit": "Küldés", "composer.replying_to": "Válasz erre:", - "composer.new_topic": "Új Topik" + "composer.new_topic": "Új Topik", + "composer.drag_and_drop_images": "Drag and Drop Images Here", + "composer.content_is_parsed_with": "Content is parsed with", + "composer.upload_instructions": "Upload images by dragging & dropping them." } \ No newline at end of file diff --git a/public/language/it/category.json b/public/language/it/category.json index 26ef78ad12..9712a85a6c 100644 --- a/public/language/it/category.json +++ b/public/language/it/category.json @@ -1,14 +1,14 @@ { - "new_topic_button": "Nuova Discussione", + "new_topic_button": "Nuovo Argomento", "no_topics": "Non ci sono discussioni in questa categoria.
    Perché non ne inizi una?", "sidebar.recent_replies": "Risposte Recenti", "sidebar.active_participants": "Partecipanti Attivi", "sidebar.moderators": "Moderatori", "posts": "post", "views": "visualizzazioni", - "posted": "inserito", - "browsing": "navigazione", - "no_replies": "Non ha ancora risposto nessuno", + "posted": "postato", + "browsing": "visualizzando", + "no_replies": "Nessuno ha risposto", "replied": "risposto", "last_edited_by": "ultima modifica di" } \ No newline at end of file diff --git a/public/language/it/footer.json b/public/language/it/footer.json index c48e0c0645..99dcfe3894 100644 --- a/public/language/it/footer.json +++ b/public/language/it/footer.json @@ -1,7 +1,7 @@ { "stats.online": "Online", "stats.users": "Utenti", - "stats.topics": "Discussioni", + "stats.topics": "Argomenti", "stats.posts": "Post", "success": "successo" } \ No newline at end of file diff --git a/public/language/it/global.json b/public/language/it/global.json index 7487945551..b9c1700a5a 100644 --- a/public/language/it/global.json +++ b/public/language/it/global.json @@ -10,47 +10,49 @@ "500.message": "Oops! Qualcosa non funziona come si deve!", "register": "Registrazione", "login": "Login", - "welcome_back": "Welcome Back ", - "you_have_successfully_logged_in": "You have successfully logged in", + "please_log_in": "Per favore Accedi", + "posting_restriction_info": "L'inserimento è attualmente ristretto ai soli utenti registrati, clicca qui per effettuare l'accesso.", + "welcome_back": "Bentornato", + "you_have_successfully_logged_in": "Login avvenuto con successo", "logout": "Logout", "logout.title": "Disconnessione avvenuta.", "logout.message": "Logout effettuato con successo", - "save_changes": "Salva", + "save_changes": "Salva cambiamenti", "close": "Chiudi", - "pagination": "Pagination", + "pagination": "Paginazione", "header.admin": "Amministratore", "header.recent": "Recenti", "header.unread": "Non letti", - "header.popular": "Popular", + "header.popular": "Popolare", "header.users": "Utenti", - "header.chats": "Chats", - "header.notifications": "Notifications", + "header.chats": "Messaggi", + "header.notifications": "Notifiche", "header.search": "Cerca", "header.profile": "Profilo", "notifications.loading": "Caricamento delle Notifiche", - "chats.loading": "Caricamento delle Chat", - "motd.welcome": "Benvenuti al NodeBB, la piattaforma di discussione del futuro.", - "motd.get": "Ottenere NodeBB", - "motd.fork": "Fork", + "chats.loading": "Caricamento Messaggi", + "motd.welcome": "Benvenuti in NodeBB, la piattaforma di discussione del futuro.", + "motd.get": "Ottieni NodeBB", + "motd.fork": "Dividi", "motd.like": "Mi piace", "motd.follow": "Segui", - "previouspage": "Previous Page", - "nextpage": "Next Page", - "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", + "previouspage": "Pagina Precedente", + "nextpage": "Pagina Successiva", + "alert.success": "Riuscito", + "alert.error": "Errore", + "alert.banned": "Bannato", + "alert.banned.message": "Sei bannato e verrai disconnesso!", + "alert.unfollow": "Non stai più seguendo %1!", + "alert.follow": "Stai seguendo %1!", + "posts": "Post", + "views": "Visualizzazioni", + "posted": "postato", "in": "in", - "recentposts": "Recent Posts", + "recentposts": "Post Recenti", "online": "Online", - "away": "Away", - "dnd": "Do not Disturb", - "invisible": "Invisible", - "offline": "Offline", + "away": "Non disponibile", + "dnd": "Non disturbare", + "invisible": "Invisibile", + "offline": "Non in linea", "privacy": "Privacy" } \ No newline at end of file diff --git a/public/language/it/language.json b/public/language/it/language.json index 76bc29d1e3..b749dfac01 100644 --- a/public/language/it/language.json +++ b/public/language/it/language.json @@ -1,5 +1,5 @@ { "name": "Italiano", - "code": "it", + "code": "it_IT", "dir": "ltr" } \ No newline at end of file diff --git a/public/language/it/login.json b/public/language/it/login.json index 61a6f7bf9f..18d043e3ce 100644 --- a/public/language/it/login.json +++ b/public/language/it/login.json @@ -1,10 +1,10 @@ { - "login": "Login", + "login": "Accedi", "username": "Nome utente", "password": "Password", "remember_me": "Memorizzami?", "forgot_password": "Password dimenticata?", - "alternative_logins": "Login Alternativi", - "failed_login_attempt": "Tentativo di login fallito; prova ancora.", - "login_successful": "Login avvenuto con successo!" + "alternative_logins": "Accessi Alternativi", + "failed_login_attempt": "Tentativo di accesso fallito, prova ancora.", + "login_successful": "Sei entrato con successo!" } \ No newline at end of file diff --git a/public/language/it/modules.json b/public/language/it/modules.json index 71d7fd74b0..b5fa9c0c82 100644 --- a/public/language/it/modules.json +++ b/public/language/it/modules.json @@ -1,6 +1,6 @@ { "chat.chatting_with": "Chatta con ", - "chat.placeholder": "scrivi un messaggio qui e premi Invio", + "chat.placeholder": "scrivi un messaggio qui, poi premi Invio", "chat.send": "Invia", - "chat.no_active": "Non hai le chat attive." + "chat.no_active": "Non hai discussioni attive." } \ No newline at end of file diff --git a/public/language/it/notifications.json b/public/language/it/notifications.json index 5c75b41c5c..a039828ca3 100644 --- a/public/language/it/notifications.json +++ b/public/language/it/notifications.json @@ -1,10 +1,10 @@ { "title": "Notifiche", - "no_notifs": "You have no new notifications", - "see_all": "See all Notifications", + "no_notifs": "Non hai nuove notifiche", + "see_all": "Vedi tutte le Notifiche", "back_to_home": "Torna alla pagina iniziale", "outgoing_link": "Link in uscita", - "outgoing_link_message": "Ci stai abbandonando", + "outgoing_link_message": "Stai lasciando", "continue_to": "Continua verso", "return_to": "Ritorna a " } \ No newline at end of file diff --git a/public/language/it/pages.json b/public/language/it/pages.json index d60e0a0a9b..80f9ef9e72 100644 --- a/public/language/it/pages.json +++ b/public/language/it/pages.json @@ -1,13 +1,13 @@ { "home": "Home", - "unread": "Unread Topics", - "popular": "Popular Topics", - "recent": "Recent Topics", - "users": "Registered Users", - "notifications": "Notifications", - "user.edit": "Editing \"%1\"", - "user.following": "People %1 Follows", - "user.followers": "People who Follow %1", - "user.favourites": "%1's Favourite Posts", - "user.settings": "User Settings" + "unread": "Argomenti non letti", + "popular": "Argomenti Popolari", + "recent": "Argomenti Recenti", + "users": "Utenti Registrati", + "notifications": "Notifiche", + "user.edit": "Modificando \"%1\"", + "user.following": "%1 Persone seguono", + "user.followers": "Persone che seguono %1", + "user.favourites": "Post Favoriti di %1", + "user.settings": "Impostazioni Utente" } \ No newline at end of file diff --git a/public/language/it/recent.json b/public/language/it/recent.json index 477ed8e887..4636a6e7a9 100644 --- a/public/language/it/recent.json +++ b/public/language/it/recent.json @@ -1,7 +1,7 @@ { - "title": "Recent", + "title": "Recenti", "day": "Giorno", "week": "Settimana", "month": "Mese", - "no_recent_topics": "There are no recent topics." + "no_recent_topics": "Non ci sono discussioni recenti." } \ No newline at end of file diff --git a/public/language/it/register.json b/public/language/it/register.json index cbd85d9de4..7fa9289292 100644 --- a/public/language/it/register.json +++ b/public/language/it/register.json @@ -13,6 +13,6 @@ "confirm_password_placeholder": "Conferma la Password", "register_now_button": "Registrati", "alternative_registration": "Altri metodi di registrazione", - "terms_of_use": "Terms of Use", - "agree_to_terms_of_use": "I agree to the Terms of Use" + "terms_of_use": "Termini di Utilizzo", + "agree_to_terms_of_use": "Accetto i Termini di Utilizzo" } \ No newline at end of file diff --git a/public/language/it/reset_password.json b/public/language/it/reset_password.json index 3070eafdbe..a8dc6250f4 100644 --- a/public/language/it/reset_password.json +++ b/public/language/it/reset_password.json @@ -2,9 +2,9 @@ "reset_password": "Resetta la Password", "update_password": "Cambia la Password", "password_changed.title": "Password Modificata", - "password_changed.message": "

    La password è stata resettata con successo. Effettua di nuovo il log in.", + "password_changed.message": "

    La password è stata resettata con successo. Effettua di nuovo l'accesso.", "wrong_reset_code.title": "Codice di reset non corretto", - "wrong_reset_code.message": "Il codice di reset ricevuto non è corretto. Prova ancora, o richiedi un nuovo codice.", + "wrong_reset_code.message": "Il codice di reset ricevuto non è corretto. Prova ancora, oppure richiedi un nuovo codice.", "new_password": "Nuova Password", "repeat_password": "Conferma la Password", "enter_email": "Inserisci il tuo indirizzo email e ti invieremo un'email con le istruzioni per resettare il tuo account.", diff --git a/public/language/it/topic.json b/public/language/it/topic.json index 0ae8b4b21b..e8e44d9f03 100644 --- a/public/language/it/topic.json +++ b/public/language/it/topic.json @@ -1,10 +1,10 @@ { - "topic": "Discussione", - "topics": "Discussioni", + "topic": "Argomento", + "topics": "Argomenti", "no_topics_found": "Nessuna discussione trovata!", - "no_posts_found": "No posts found!", + "no_posts_found": "Nessun post trovato!", "profile": "Profilo", - "posted_by": "Posted by", + "posted_by": "Inviato da", "chat": "Chat", "notify_me": "Ricevi notifiche di nuove risposte in questa discussione", "quote": "Citazione", @@ -12,54 +12,62 @@ "edit": "Modifica", "delete": "Cancella", "move": "Muovi", - "fork": "Fork", + "fork": "Dividi", "banned": "bannato", "link": "Link", - "share": "Share", - "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.", - "watch": "Watch", - "share_this_post": "Share this Post", + "share": "Condividi", + "tools": "Strumenti", + "flag": "Segnala", + "flag_title": "Segnala questo post per la moderazione", + "deleted_message": "Questo argomento è stato cancellato. Solo gli utenti che possono gestire gli argomenti riescono a vederlo.", + "following_topic.title": "Argomento seguente", + "following_topic.message": "Da ora riceverai notifiche quando qualcuno posterà in questa discussione.", + "not_following_topic.title": "Non stai seguendo questo argomento", + "not_following_topic.message": "Non riceverai più notifiche da questa discussione.", + "login_to_subscribe": "Per favore registrati o accedi per sottoscrivere questo argomento", + "watch": "Guarda", + "share_this_post": "Condividi questo Post", "thread_tools.title": "Strumenti per il Thread", - "thread_tools.markAsUnreadForAll": "Mark Unread", - "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", + "thread_tools.markAsUnreadForAll": "Segna come non letto", + "thread_tools.pin": "Pinna Argomento", + "thread_tools.unpin": "Unpin Argomento", + "thread_tools.lock": "Blocca Discussione", + "thread_tools.unlock": "Sblocca Discussione", + "thread_tools.move": "Sposta Discussione", + "thread_tools.fork": "Dividi Discussione", + "thread_tools.delete": "Elimina Discussione", + "thread_tools.restore": "Ripristina Discussione", + "load_categories": "Caricamento Categorie", "disabled_categories_note": "Le Categorie disabilitate sono in grigio", "confirm_move": "Sposta", - "confirm_fork": "Fork", + "confirm_fork": "Dividi", "favourite": "Preferito", "favourites": "Preferiti", "favourites.not_logged_in.title": "Non collegato/a", - "favourites.not_logged_in.message": "Log in per aggiungere questo post ai preferiti", + "favourites.not_logged_in.message": "Accedi 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", + "vote.not_logged_in.title": "Non loggato", + "vote.not_logged_in.message": "Accedi per poter votare", + "vote.cant_vote_self.title": "Voto non valido", + "vote.cant_vote_self.message": "Non puoi votare per i tuoi post", "loading_more_posts": "Caricamento altri post", - "move_topic": "Spsota Discussione", + "move_topic": "Sposta Discussione", "move_post": "Sposta Post", - "fork_topic": "Fork Topic", + "fork_topic": "Dividi il Topic", "topic_will_be_moved_to": "Questa discussione verrà spostata nella categoria", - "fork_topic_instruction": "Clicca sui post che vuoi forkare", + "fork_topic_instruction": "Clicca sui post che vuoi dividere", "fork_no_pids": "Nessun post selezionato!", - "fork_success": "Discussione forkata con successo!", + "fork_success": "Discussione divisa con successo!", "reputation": "Reputazione", "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" + "composer.title_placeholder": "Inserisci qui il titolo della discussione...", + "composer.write": "Scrivi", + "composer.preview": "Anteprima", + "composer.discard": "Scarta", + "composer.submit": "Invia", + "composer.replying_to": "Rispondendo a", + "composer.new_topic": "Nuovo Argomento", + "composer.drag_and_drop_images": "Trascina e rilascia le immagini qui", + "composer.content_is_parsed_with": "Il contenuto è analizzato con", + "composer.upload_instructions": "Carica immagini trascinandole e rilasciandole." } \ No newline at end of file diff --git a/public/language/it/unread.json b/public/language/it/unread.json index d42f3f38ac..362b11e8f5 100644 --- a/public/language/it/unread.json +++ b/public/language/it/unread.json @@ -1,5 +1,5 @@ { - "title": "Unread", + "title": "Non letto", "no_unread_topics": "Non ci sono discussioni non lette.", "mark_all_read": "Segna tutto come già letto", "load_more": "Carica Altro" diff --git a/public/language/it/user.json b/public/language/it/user.json index 5caa73bd27..25f7a614a1 100644 --- a/public/language/it/user.json +++ b/public/language/it/user.json @@ -9,39 +9,39 @@ "age": "Età", "joined": "Iscrizione", "lastonline": "Ultima volta in linea", - "profile": "Profile", + "profile": "Profilo", "profile_views": "Visite al profilo", "reputation": "Reputazione", "posts": "Post", - "favourites": "Favourites", + "favourites": "Favoriti", "followers": "Da chi è seguito", "following": "Chi segue", "signature": "Firma", "gravatar": "Gravatar", "birthday": "Data di nascita", "chat": "Chat", - "follow": "Follow", - "unfollow": "Unfollow", - "change_picture": "Cambia la foto", + "follow": "Segui", + "unfollow": "Smetti di seguire", + "change_picture": "Cambia Foto", "edit": "Modifica", "uploaded_picture": "Foto caricata", "upload_new_picture": "Carica una nuova foto", - "current_password": "Current Password", + "current_password": "Password corrente", "change_password": "Cambia la Password", "confirm_password": "Conferma la Password", "password": "Password", "upload_picture": "Carica foto", "upload_a_picture": "Carica una foto", - "image_spec": "You may only upload PNG, JPG, or GIF files", - "max": "max.", - "settings": "Settings", + "image_spec": "Puoi caricare solo file PNG, JPG o GIF", + "max": "massimo.", + "settings": "Impostazioni", "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.", + "has_no_posts": "Questo utente non ha ancora postato nulla.", "email_hidden": "Email Nascosta", "hidden": "nascosta", - "paginate_description": "Paginate topics and posts instead of using infinite scroll.", - "topics_per_page": "Topics per Page", - "posts_per_page": "Posts per Page" + "paginate_description": "Dividi argomenti e post in pagine anziché usare lo scroll infinito.", + "topics_per_page": "Argomenti per Pagina", + "posts_per_page": "Post per Pagina" } \ No newline at end of file diff --git a/public/language/it/users.json b/public/language/it/users.json index a3bbbb54e7..12dcfa09ff 100644 --- a/public/language/it/users.json +++ b/public/language/it/users.json @@ -5,5 +5,5 @@ "online": "In linea", "search": "Cerca", "enter_username": "Inserisci il nome utente da cercare", - "load_more": "Carica di più" + "load_more": "Carica altri" } \ No newline at end of file diff --git a/public/language/pl/global.json b/public/language/pl/global.json index b8f5162365..9b979e6373 100644 --- a/public/language/pl/global.json +++ b/public/language/pl/global.json @@ -10,6 +10,8 @@ "500.message": "Coś poszło nie tak.", "register": "Zarejestruj się", "login": "Zaloguj się", + "please_log_in": "Proszę się zalogować", + "posting_restriction_info": "Pisanie jest dostępne tylko dla zarejestrowanych członków forum, kliknij tutaj aby się zalogować.", "welcome_back": "Witaj z powrotem!", "you_have_successfully_logged_in": "Zostałeś pomyślnie zalogowany.", "logout": "Wyloguj się", diff --git a/public/language/pl/pages.json b/public/language/pl/pages.json index ee44ea945b..c91a2daff9 100644 --- a/public/language/pl/pages.json +++ b/public/language/pl/pages.json @@ -1,7 +1,7 @@ { "home": "Strona główna", "unread": "Nieprzeczytane wątki", - "popular": "Popular Topics", + "popular": "Popularne wątki", "recent": "Ostatnie wątki", "users": "Zarejestrowani użytkownicy", "notifications": "Powiadomienia", diff --git a/public/language/pl/topic.json b/public/language/pl/topic.json index 020d68d6c2..8127f73075 100644 --- a/public/language/pl/topic.json +++ b/public/language/pl/topic.json @@ -20,6 +20,11 @@ "flag": "Zgłoś", "flag_title": "Zgłoś post do moderacji", "deleted_message": "Ten wątek został usunięty. Tylko użytkownicy z uprawnieniami do zarządzania wątkami mogą go widzieć.", + "following_topic.title": "Obserwujesz wątek", + "following_topic.message": "Będziesz otrzymywał powiadomienia, gdy ktoś odpowie w tym wątku.", + "not_following_topic.title": "Nie obserwujesz wątku", + "not_following_topic.message": "Nie będziesz otrzymywał więcej powiadomień z tego wątku.", + "login_to_subscribe": "Zaloguj się, aby subskrybować ten wątek.", "watch": "Obserwuj", "share_this_post": "Udostępnij", "thread_tools.title": "Narzędzia wątków", @@ -61,5 +66,8 @@ "composer.discard": "Odrzuć", "composer.submit": "Wyślij", "composer.replying_to": "Odpowiadasz", - "composer.new_topic": "Nowy wątek" + "composer.new_topic": "Nowy wątek", + "composer.drag_and_drop_images": "Przeciągnij i upuść obrazek tutaj.", + "composer.content_is_parsed_with": "Tekst jest parsowany przy pomocy", + "composer.upload_instructions": "Prześlij obrazki przeciągając i upuszczając je." } \ No newline at end of file diff --git a/public/language/zh_CN/global.json b/public/language/zh_CN/global.json index ca76a1ea64..3d930991d7 100644 --- a/public/language/zh_CN/global.json +++ b/public/language/zh_CN/global.json @@ -7,50 +7,52 @@ "404.title": "无法找到该页", "404.message": "你所查找的页面并不存在，返回主页。", "500.title": "内部错误", - "500.message": "不好！看来是哪里出错了！", + "500.message": "哎呀！看来是哪里出错了！", "register": "注册", "login": "登录", + "please_log_in": "请登录", + "posting_restriction_info": "发表目前仅限于注册会员，点击这里登录。", "welcome_back": "欢迎回来", - "you_have_successfully_logged_in": "You have successfully logged in", + "you_have_successfully_logged_in": "你已经退出登录", "logout": "退出", "logout.title": "你已经退出。", "logout.message": "你已经成功退出登录。", "save_changes": "保存修改", "close": "关闭", - "pagination": "Pagination", + "pagination": "分页", "header.admin": "管理", "header.recent": "最近", "header.unread": "未读", - "header.popular": "Popular", + "header.popular": "流行", "header.users": "用户", - "header.chats": "Chats", - "header.notifications": "Notifications", + "header.chats": "聊天", + "header.notifications": "通知", "header.search": "搜索", "header.profile": "设置", "notifications.loading": "消息载入中", "chats.loading": "聊天载入中", - "motd.welcome": "Welcome to NodeBB, the discussion platform of the future.", - "motd.get": "Get NodeBB", - "motd.fork": "Fork", - "motd.like": "讚", + "motd.welcome": "欢迎来到NodeBB，未来的社区论坛平台。", + "motd.get": "获取NodeBB", + "motd.fork": "分支", + "motd.like": "赞", "motd.follow": "关注", - "previouspage": "Previous Page", - "nextpage": "Next Page", - "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", - "online": "Online", - "away": "Away", - "dnd": "Do not Disturb", - "invisible": "Invisible", - "offline": "Offline", - "privacy": "Privacy" + "previouspage": "上一页", + "nextpage": "下一页", + "alert.success": "成功", + "alert.error": "错误", + "alert.banned": "禁止", + "alert.banned.message": "你被禁止了将会退出登录。", + "alert.unfollow": "你不再是关注的那1%!", + "alert.follow": "你现在属于关注的1%!", + "posts": "帖子", + "views": "浏览", + "posted": "发布", + "in": "在", + "recentposts": "最新发表", + "online": " 在线", + "away": "离开", + "dnd": "不打扰", + "invisible": "不可见", + "offline": "离线", + "privacy": "隐私" } \ No newline at end of file diff --git a/public/language/zh_CN/notifications.json b/public/language/zh_CN/notifications.json index 0e9a54f527..8ecb526603 100644 --- a/public/language/zh_CN/notifications.json +++ b/public/language/zh_CN/notifications.json @@ -1,10 +1,10 @@ { - "title": "消息", - "no_notifs": "You have no new notifications", - "see_all": "See all Notifications", + "title": "通知", + "no_notifs": "你没有新的通知", + "see_all": "查看所有通知", "back_to_home": "返回主页", "outgoing_link": "站外链接", - "outgoing_link_message": "你正在离开本站。", + "outgoing_link_message": "你正在离开本站", "continue_to": "继续前往", "return_to": "返回" } \ No newline at end of file diff --git a/public/language/zh_CN/pages.json b/public/language/zh_CN/pages.json index d60e0a0a9b..d4218f3f08 100644 --- a/public/language/zh_CN/pages.json +++ b/public/language/zh_CN/pages.json @@ -1,13 +1,13 @@ { - "home": "Home", - "unread": "Unread Topics", - "popular": "Popular Topics", - "recent": "Recent Topics", - "users": "Registered Users", - "notifications": "Notifications", - "user.edit": "Editing \"%1\"", - "user.following": "People %1 Follows", - "user.followers": "People who Follow %1", - "user.favourites": "%1's Favourite Posts", - "user.settings": "User Settings" + "home": "主页", + "unread": "未读", + "popular": "受欢迎的主题", + "recent": "最新主题", + "users": "已注册用户", + "notifications": "提醒", + "user.edit": "编辑 \"%1\"", + "user.following": "%1的人关注", + "user.followers": "%1关注的人", + "user.favourites": "%1 喜爱的帖子", + "user.settings": "用户设置" } \ No newline at end of file diff --git a/public/language/zh_CN/recent.json b/public/language/zh_CN/recent.json index 179cf32202..41eadeaa81 100644 --- a/public/language/zh_CN/recent.json +++ b/public/language/zh_CN/recent.json @@ -1,7 +1,7 @@ { - "title": "Recent", + "title": "最近", "day": "今日", "week": "本周", "month": "本月", - "no_recent_topics": "There are no recent topics." + "no_recent_topics": "没有最近的话题。" } \ No newline at end of file diff --git a/public/language/zh_CN/register.json b/public/language/zh_CN/register.json index 1093ad2879..6cd050de46 100644 --- a/public/language/zh_CN/register.json +++ b/public/language/zh_CN/register.json @@ -3,7 +3,7 @@ "help.email": "默认情况下，你的邮箱不会公开。", "help.username_restrictions": "用户名由%1到%2个字符组成。其他人可以通过 @用户名 点名你。", "help.minimum_password_length": "密码必须至少包含%1个字符。", - "email_address": "Email", + "email_address": "邮箱地址", "email_address_placeholder": "输入邮箱地址", "username": "用户名", "username_placeholder": "输入用户名", @@ -13,6 +13,6 @@ "confirm_password_placeholder": "再次输入密码", "register_now_button": "现在注册", "alternative_registration": "其他方式注册", - "terms_of_use": "Terms of Use", - "agree_to_terms_of_use": "I agree to the Terms of Use" + "terms_of_use": "使用条款", + "agree_to_terms_of_use": "我同意使用条款" } \ No newline at end of file diff --git a/public/language/zh_CN/topic.json b/public/language/zh_CN/topic.json index 30ae7c73fe..381c310b52 100644 --- a/public/language/zh_CN/topic.json +++ b/public/language/zh_CN/topic.json @@ -2,9 +2,9 @@ "topic": "主题", "topics": "主题", "no_topics_found": "没有找到主题！", - "no_posts_found": "No posts found!", + "no_posts_found": "没有找到帖子!", "profile": "资料", - "posted_by": "Posted by", + "posted_by": "发表", "chat": "聊天", "notify_me": "该主题有新回复时通知我", "quote": "引用", @@ -13,25 +13,30 @@ "delete": "删除", "move": "移动", "fork": "作为主题", - "banned": "封禁", + "banned": "禁止", "link": "链接", - "share": "Share", - "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.", - "watch": "Watch", - "share_this_post": "Share this Post", + "share": "分享", + "tools": "工具", + "flag": "标志", + "flag_title": "标志受限的帖子", + "deleted_message": "这个帖子已经删除，只有帖子的拥有者才有权限去查看。", + "following_topic.title": "关注该主题", + "following_topic.message": "当有回复提交的时候你将会收到通知。", + "not_following_topic.title": "非关注主题", + "not_following_topic.message": "你将不再接受来自该帖子的通知。", + "login_to_subscribe": "请注册或登录以订阅该主题", + "watch": "查看", + "share_this_post": "分享帖子", "thread_tools.title": "管理工具", - "thread_tools.markAsUnreadForAll": "Mark Unread", - "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.markAsUnreadForAll": "标记未读", + "thread_tools.pin": "置顶主题", + "thread_tools.unpin": "解除置顶", + "thread_tools.lock": "锁定主题", + "thread_tools.unlock": "解除锁定", + "thread_tools.move": "移动主题", + "thread_tools.fork": "分叉主题", + "thread_tools.delete": "删除主题", + "thread_tools.restore": "恢复主题", "load_categories": "版面载入中", "disabled_categories_note": "停用的版面为灰色", "confirm_move": "移动", @@ -41,10 +46,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", + "vote.not_logged_in.title": "未登录", + "vote.not_logged_in.message": "收藏帖子之前请先登录。", + "vote.cant_vote_self.title": "废票 ", + "vote.cant_vote_self.message": "你不能为自己的帖子投票", "loading_more_posts": "载入更多帖子", "move_topic": "移动主题", "move_post": "移动帖子", @@ -55,11 +60,14 @@ "fork_success": "成功将帖子作为主题！", "reputation": "声望", "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" + "composer.title_placeholder": "在这里输入你的主题标题...", + "composer.write": "书写", + "composer.preview": "预览", + "composer.discard": "丢弃", + "composer.submit": "提交", + "composer.replying_to": "回复", + "composer.new_topic": "新主题", + "composer.drag_and_drop_images": "把图像拖到此处", + "composer.content_is_parsed_with": "内容已经被解析", + "composer.upload_instructions": "拖拽图片以上传" } \ No newline at end of file diff --git a/public/language/zh_CN/unread.json b/public/language/zh_CN/unread.json index a880df356e..b5107e3b47 100644 --- a/public/language/zh_CN/unread.json +++ b/public/language/zh_CN/unread.json @@ -1,5 +1,5 @@ { - "title": "Unread", + "title": "未读", "no_unread_topics": "没有未读主题。", "mark_all_read": "标记全部为已读", "load_more": "载入更多" From 74d6392bec856e69acd0551b8f5cda25941bf09b Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 26 Feb 2014 14:55:45 -0500 Subject: [PATCH 06/19] added Dutch language --- .tx/config | 15 ++++++ public/language/nl/category.json | 14 +++++ public/language/nl/footer.json | 7 +++ public/language/nl/global.json | 58 ++++++++++++++++++++ public/language/nl/language.json | 5 ++ public/language/nl/login.json | 10 ++++ public/language/nl/modules.json | 6 +++ public/language/nl/notifications.json | 10 ++++ public/language/nl/pages.json | 13 +++++ public/language/nl/recent.json | 7 +++ public/language/nl/register.json | 18 +++++++ public/language/nl/reset_password.json | 13 +++++ public/language/nl/topic.json | 73 ++++++++++++++++++++++++++ public/language/nl/unread.json | 6 +++ public/language/nl/user.json | 47 +++++++++++++++++ public/language/nl/users.json | 9 ++++ 16 files changed, 311 insertions(+) create mode 100644 public/language/nl/category.json create mode 100644 public/language/nl/footer.json create mode 100644 public/language/nl/global.json create mode 100644 public/language/nl/language.json create mode 100644 public/language/nl/login.json create mode 100644 public/language/nl/modules.json create mode 100644 public/language/nl/notifications.json create mode 100644 public/language/nl/pages.json create mode 100644 public/language/nl/recent.json create mode 100644 public/language/nl/register.json create mode 100644 public/language/nl/reset_password.json create mode 100644 public/language/nl/topic.json create mode 100644 public/language/nl/unread.json create mode 100644 public/language/nl/user.json create mode 100644 public/language/nl/users.json diff --git a/.tx/config b/.tx/config index b09f5b11ec..6f403b6cf1 100644 --- a/.tx/config +++ b/.tx/config @@ -15,6 +15,7 @@ trans.he = public/language/he/category.json trans.hu = public/language/hu/category.json trans.it = public/language/it/category.json trans.nb = public/language/nb/category.json +trans.nl = public/language/nl/category.json trans.pl = public/language/pl/category.json trans.pt_BR = public/language/pt_BR/category.json trans.ru = public/language/ru/category.json @@ -39,6 +40,7 @@ trans.he = public/language/he/login.json trans.hu = public/language/hu/login.json trans.it = public/language/it/login.json trans.nb = public/language/nb/login.json +trans.nl = public/language/nl/login.json trans.pl = public/language/pl/login.json trans.pt_BR = public/language/pt_BR/login.json trans.ru = public/language/ru/login.json @@ -62,6 +64,7 @@ trans.he = public/language/he/recent.json trans.hu = public/language/hu/recent.json trans.it = public/language/it/recent.json trans.nb = public/language/nb/recent.json +trans.nl = public/language/nl/recent.json trans.pl = public/language/pl/recent.json trans.pt_BR = public/language/pt_BR/recent.json trans.ru = public/language/ru/recent.json @@ -85,6 +88,7 @@ trans.he = public/language/he/unread.json trans.hu = public/language/hu/unread.json trans.it = public/language/it/unread.json trans.nb = public/language/nb/unread.json +trans.nl = public/language/nl/unread.json trans.pl = public/language/pl/unread.json trans.pt_BR = public/language/pt_BR/unread.json trans.ru = public/language/ru/unread.json @@ -108,6 +112,7 @@ trans.he = public/language/he/footer.json trans.hu = public/language/hu/footer.json trans.it = public/language/it/footer.json trans.nb = public/language/nb/footer.json +trans.nl = public/language/nl/footer.json trans.pl = public/language/pl/footer.json trans.pt_BR = public/language/pt_BR/footer.json trans.ru = public/language/ru/footer.json @@ -131,6 +136,7 @@ trans.he = public/language/he/modules.json trans.hu = public/language/hu/modules.json trans.it = public/language/it/modules.json trans.nb = public/language/nb/modules.json +trans.nl = public/language/nl/modules.json trans.pl = public/language/pl/modules.json trans.pt_BR = public/language/pt_BR/modules.json trans.ru = public/language/ru/modules.json @@ -154,6 +160,7 @@ trans.he = public/language/he/register.json trans.hu = public/language/hu/register.json trans.it = public/language/it/register.json trans.nb = public/language/nb/register.json +trans.nl = public/language/nl/register.json trans.pl = public/language/pl/register.json trans.pt_BR = public/language/pt_BR/register.json trans.ru = public/language/ru/register.json @@ -177,6 +184,7 @@ trans.he = public/language/he/user.json trans.hu = public/language/hu/user.json trans.it = public/language/it/user.json trans.nb = public/language/nb/user.json +trans.nl = public/language/nl/user.json trans.pl = public/language/pl/user.json trans.pt_BR = public/language/pt_BR/user.json trans.ru = public/language/ru/user.json @@ -200,6 +208,7 @@ trans.he = public/language/he/global.json trans.hu = public/language/hu/global.json trans.it = public/language/it/global.json trans.nb = public/language/nb/global.json +trans.nl = public/language/nl/global.json trans.pl = public/language/pl/global.json trans.pt_BR = public/language/pt_BR/global.json trans.ru = public/language/ru/global.json @@ -223,6 +232,7 @@ trans.he = public/language/he/notifications.json trans.hu = public/language/hu/notifications.json trans.it = public/language/it/notifications.json trans.nb = public/language/nb/notifications.json +trans.nl = public/language/nl/notifications.json trans.pl = public/language/pl/notifications.json trans.pt_BR = public/language/pt_BR/notifications.json trans.ru = public/language/ru/notifications.json @@ -246,6 +256,7 @@ trans.he = public/language/he/reset_password.json trans.hu = public/language/hu/reset_password.json trans.it = public/language/it/reset_password.json trans.nb = public/language/nb/reset_password.json +trans.nl = public/language/nl/reset_password.json trans.pl = public/language/pl/reset_password.json trans.pt_BR = public/language/pt_BR/reset_password.json trans.ru = public/language/ru/reset_password.json @@ -269,6 +280,7 @@ trans.he = public/language/he/users.json trans.hu = public/language/hu/users.json trans.it = public/language/it/users.json trans.nb = public/language/nb/users.json +trans.nl = public/language/nl/users.json trans.pl = public/language/pl/users.json trans.pt_BR = public/language/pt_BR/users.json trans.ru = public/language/ru/users.json @@ -292,6 +304,7 @@ trans.he = public/language/he/language.json trans.hu = public/language/hu/language.json trans.it = public/language/it/language.json trans.nb = public/language/nb/language.json +trans.nl = public/language/nl/language.json trans.pl = public/language/pl/language.json trans.pt_BR = public/language/pt_BR/language.json trans.ru = public/language/ru/language.json @@ -315,6 +328,7 @@ trans.he = public/language/he/pages.json trans.hu = public/language/hu/pages.json trans.it = public/language/it/pages.json trans.nb = public/language/nb/pages.json +trans.nl = public/language/nl/pages.json trans.pl = public/language/pl/pages.json trans.pt_BR = public/language/pt_BR/pages.json trans.ru = public/language/ru/pages.json @@ -338,6 +352,7 @@ trans.he = public/language/he/topic.json trans.hu = public/language/hu/topic.json trans.it = public/language/it/topic.json trans.nb = public/language/nb/topic.json +trans.nl = public/language/nl/topic.json trans.pl = public/language/pl/topic.json trans.pt_BR = public/language/pt_BR/topic.json trans.ru = public/language/ru/topic.json diff --git a/public/language/nl/category.json b/public/language/nl/category.json new file mode 100644 index 0000000000..af6ba62510 --- /dev/null +++ b/public/language/nl/category.json @@ -0,0 +1,14 @@ +{ + "new_topic_button": "Nieuw onderwerp", + "no_topics": "Er zijn geen onderwerpen in deze categorie.
    Waarom maak je er niet een aan?", + "sidebar.recent_replies": "Recente Reacties", + "sidebar.active_participants": "Actieve Deelnemers", + "sidebar.moderators": "Moderators", + "posts": "berichten", + "views": "weergaven", + "posted": "geplaatst", + "browsing": "verkennen", + "no_replies": "Niemand heeft gereageerd", + "replied": "gereageerd", + "last_edited_by": "voor het laatst aangepast door" +} \ No newline at end of file diff --git a/public/language/nl/footer.json b/public/language/nl/footer.json new file mode 100644 index 0000000000..7ed4195115 --- /dev/null +++ b/public/language/nl/footer.json @@ -0,0 +1,7 @@ +{ + "stats.online": "Online", + "stats.users": "Gebruikers", + "stats.topics": "Onderwerpen", + "stats.posts": "Berichten", + "success": "succes" +} \ No newline at end of file diff --git a/public/language/nl/global.json b/public/language/nl/global.json new file mode 100644 index 0000000000..d9a3048fd6 --- /dev/null +++ b/public/language/nl/global.json @@ -0,0 +1,58 @@ +{ + "home": "Home", + "search": "Zoeken", + "buttons.close": "Sluiten", + "403.title": "Toegang Geweigerd", + "403.message": "Het lijkt erop dat je op een pagina beland bent waar je geen toegang tot hebt. Misschien moet je inloggen?", + "404.title": "Niet Gevonden", + "404.message": "Het lijkt erop dat je op een pagina beland bent die niet bestaat. Ga terug naar de home pagina.", + "500.title": "Interne fout.", + "500.message": "Oeps! Het lijkt erop dat iets is fout gegaan!", + "register": "Registeren", + "login": "Inloggen", + "please_log_in": "Please Log In", + "posting_restriction_info": "Posting is currently restricted to registered members only, click here to log in.", + "welcome_back": "Welcome Back ", + "you_have_successfully_logged_in": "You have successfully logged in", + "logout": "Uitloggen", + "logout.title": "Je bent nu uitgelogd.", + "logout.message": "Je bent met succes uitgelogd van NodeBB", + "save_changes": "Aanpassingen Opslaan", + "close": "Sluiten", + "pagination": "Pagination", + "header.admin": "Admin", + "header.recent": "Recent", + "header.unread": "Ongelezen", + "header.popular": "Populair", + "header.users": "Gebruikers", + "header.chats": "Chats", + "header.notifications": "Notificaties", + "header.search": "Zoeken", + "header.profile": "Profiel", + "notifications.loading": "Notificaties Laden", + "chats.loading": "Chats Laden", + "motd.welcome": "Welkom bij NodeBB, het discussie platform van de toekomst.", + "motd.get": "Verkrijg NodeBB", + "motd.fork": "Fork", + "motd.like": "Like", + "motd.follow": "Volgen", + "previouspage": "Vorige Pagina", + "nextpage": "Volgende Pagina", + "alert.success": "Succes", + "alert.error": "Fout", + "alert.banned": "Verbannen", + "alert.banned.message": "Je bent verbannen en zal uitgelogd worden!", + "alert.unfollow": "Je volgt niet langer %1!", + "alert.follow": "Je volgt nu %1!", + "posts": "Berichten", + "views": "Weergaven", + "posted": "geplaatst", + "in": "in", + "recentposts": "Recente Berichten", + "online": "Online", + "away": "Afwezig", + "dnd": "Niet Storen", + "invisible": "Onzichtbaar", + "offline": "Offline", + "privacy": "Privacy" +} \ No newline at end of file diff --git a/public/language/nl/language.json b/public/language/nl/language.json new file mode 100644 index 0000000000..5490106fc4 --- /dev/null +++ b/public/language/nl/language.json @@ -0,0 +1,5 @@ +{ + "name": "Nederlands", + "code": "nl", + "dir": "ltr" +} \ No newline at end of file diff --git a/public/language/nl/login.json b/public/language/nl/login.json new file mode 100644 index 0000000000..497b623098 --- /dev/null +++ b/public/language/nl/login.json @@ -0,0 +1,10 @@ +{ + "login": "Inloggen", + "username": "Gebruikersnaam", + "password": "Wachtwoord", + "remember_me": "Mij Onthouden?", + "forgot_password": "Wachtwoord Vergeten?", + "alternative_logins": "Alternatieve Logins", + "failed_login_attempt": "Mislukte inlog poging, probeer het later opnieuw.", + "login_successful": "Je bent succesvol ingelogd!" +} \ No newline at end of file diff --git a/public/language/nl/modules.json b/public/language/nl/modules.json new file mode 100644 index 0000000000..6a9b77b68b --- /dev/null +++ b/public/language/nl/modules.json @@ -0,0 +1,6 @@ +{ + "chat.chatting_with": "Chat met ", + "chat.placeholder": "type chat bericht hier, druk op enter om te verzenden", + "chat.send": "Verzenden", + "chat.no_active": "Je hebt geen actieve chats." +} \ No newline at end of file diff --git a/public/language/nl/notifications.json b/public/language/nl/notifications.json new file mode 100644 index 0000000000..1b1b4bbf8c --- /dev/null +++ b/public/language/nl/notifications.json @@ -0,0 +1,10 @@ +{ + "title": "Notificaties", + "no_notifs": "You have no new notifications", + "see_all": "Bekijk alle Notificaties", + "back_to_home": "Terug naar NodeBB", + "outgoing_link": "Uitgaande Link", + "outgoing_link_message": "Je verlaat nu", + "continue_to": "Doorgaan naar", + "return_to": "Teruggaan naar" +} \ No newline at end of file diff --git a/public/language/nl/pages.json b/public/language/nl/pages.json new file mode 100644 index 0000000000..07a6963b89 --- /dev/null +++ b/public/language/nl/pages.json @@ -0,0 +1,13 @@ +{ + "home": "Home", + "unread": "Ongelezen Onderwerpen", + "popular": "Popular Topics", + "recent": "Recente Onderwerpen", + "users": "Geregistreerde Gebruikers", + "notifications": "Notificaties", + "user.edit": "\"%1\" aanpassen", + "user.following": "Mensen %1 Volgt", + "user.followers": "Mensen die %1 Volgen", + "user.favourites": "%1's Favoriete Berichten", + "user.settings": "Gebruikersinstellingen" +} \ No newline at end of file diff --git a/public/language/nl/recent.json b/public/language/nl/recent.json new file mode 100644 index 0000000000..c9ab5e0b73 --- /dev/null +++ b/public/language/nl/recent.json @@ -0,0 +1,7 @@ +{ + "title": "Recent", + "day": "Dag", + "week": "Week", + "month": "Maand", + "no_recent_topics": "Er zijn geen recente reacties." +} \ No newline at end of file diff --git a/public/language/nl/register.json b/public/language/nl/register.json new file mode 100644 index 0000000000..09dc7f786a --- /dev/null +++ b/public/language/nl/register.json @@ -0,0 +1,18 @@ +{ + "register": "Registreren", + "help.email": "Je email is standaard verborgen voor andere gebruikers.", + "help.username_restrictions": "Een unieke gebruikersnaam tussen %1 en %2 karakters. Anderen kunnen je vermelden met @gebruikersnaam.", + "help.minimum_password_length": "Je wachtwoord moet tenminste %1 karakters lang zijn.", + "email_address": "Email Adres", + "email_address_placeholder": "Vul Email Adres in", + "username": "Gebruikersnaam", + "username_placeholder": "Vul Gebruikersnaam in", + "password": "Wachtwoord", + "password_placeholder": "Vul Wachtwoord in", + "confirm_password": "Bevestig Wachtwoord", + "confirm_password_placeholder": "Bevestig Wachtwoord", + "register_now_button": "Nu Registreren", + "alternative_registration": "Alternatieve Registratie", + "terms_of_use": "Gebruiksvoorwaarden", + "agree_to_terms_of_use": "Ik ga akkoord van de Gebruiksvoorwaarden" +} \ No newline at end of file diff --git a/public/language/nl/reset_password.json b/public/language/nl/reset_password.json new file mode 100644 index 0000000000..823816168c --- /dev/null +++ b/public/language/nl/reset_password.json @@ -0,0 +1,13 @@ +{ + "reset_password": "Wachtwoord opnieuw instellen", + "update_password": "Wachtwoord Updaten", + "password_changed.title": "Wachtwoord Veranderd", + "password_changed.message": "

    Wachtwoord is met succes gereset, log a.u.b. opnieuw in.", + "wrong_reset_code.title": "Incorrecte Reset Code", + "wrong_reset_code.message": "De ontvangen reset code is incorrect. Probeer het opnieuw, of vraag een nieuwe code aan.", + "new_password": "Nieuw Wachtwoord", + "repeat_password": "Bevestig Wachtwoord", + "enter_email": "Vul a.u.b. je email address in en we versturen je een email met de stappen hoe je je account reset.", + "password_reset_sent": "Wachtwoord Reset Verzonden", + "invalid_email": "Fout Email Adres / Email Adres bestaat niet!" +} \ No newline at end of file diff --git a/public/language/nl/topic.json b/public/language/nl/topic.json new file mode 100644 index 0000000000..a0d1dd9ffb --- /dev/null +++ b/public/language/nl/topic.json @@ -0,0 +1,73 @@ +{ + "topic": "Onderwerp", + "topics": "Onderwerpen", + "no_topics_found": "Geen onderwerpen gevonden!", + "no_posts_found": "Geen berichten gevonden!", + "profile": "Profiel", + "posted_by": "Geplaatst door", + "chat": "Chat", + "notify_me": "Krijg notificaties van nieuwe reacties op dit onderwerp", + "quote": "Citeren", + "reply": "Reageren", + "edit": "Aanpassen", + "delete": "Verwijderen", + "move": "Verplaatsen", + "fork": "Fork", + "banned": "verbannen", + "link": "Link", + "share": "Delen", + "tools": "Gereedschap", + "flag": "Markeren", + "flag_title": "Dit bericht markeren voor moderatie", + "deleted_message": "Dit onderwerp is verwijderd. Alleen gebruikers met onderwerp management privileges kunnen dit onderwerp zien.", + "following_topic.title": "Following Topic", + "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.", + "not_following_topic.title": "Not Following Topic", + "not_following_topic.message": "You will no longer receive notifications from this topic.", + "login_to_subscribe": "Please register or log in in order to subscribe to this topic", + "watch": "Watch", + "share_this_post": "Share this Post", + "thread_tools.title": "Thread Gereedschap", + "thread_tools.markAsUnreadForAll": "Ongelezen Markeren", + "thread_tools.pin": "Onderwerp Vastmaken", + "thread_tools.unpin": "Onderwerp Losmaken", + "thread_tools.lock": "Onderwerp Sluiten", + "thread_tools.unlock": "Onderwerp Openen", + "thread_tools.move": "Onderwerp Verplaatsen", + "thread_tools.fork": "Onderwerp Forken", + "thread_tools.delete": "Onderwerp Verwijderen", + "thread_tools.restore": "Onderwerp Herstellen", + "load_categories": "Categorieën Laden", + "disabled_categories_note": "Uitgeschakelde Categorieën zijn grijs", + "confirm_move": "Verplaatsen", + "confirm_fork": "Fork", + "favourite": "Favoriet", + "favourites": "Favorieten", + "favourites.not_logged_in.title": "Niet Ingelogd", + "favourites.not_logged_in.message": "Log a.u.b. in om dit bericht als Favoriet op te slaan", + "favourites.has_no_favourites": "Je hebt geen favorieten, sla een aantal berichten op als favoriet om ze hier te zien!", + "vote.not_logged_in.title": "Niet Ingelogd", + "vote.not_logged_in.message": "Log a.u.b. in om te kunnen stemmen", + "vote.cant_vote_self.title": "Ongeldige Stem", + "vote.cant_vote_self.message": "Je kan niet op je eigen berichten stemmen", + "loading_more_posts": "Meer Berichten Laden", + "move_topic": "Onderwerp Verplaatsen", + "move_post": "Bericht Verplaatsen", + "fork_topic": "Onderwerp Forken", + "topic_will_be_moved_to": "Dit onderwerp zal verplaatst worden naar de categorie", + "fork_topic_instruction": "Klik op de berichten die je wilt forken", + "fork_no_pids": "Geen berichten geselecteerd!", + "fork_success": "Onderwerp is met succes geforkt!", + "reputation": "Reputatie", + "posts": "Berichten", + "composer.title_placeholder": "Vul de titel voor het onderwerp hier in...", + "composer.write": "Schrijven", + "composer.preview": "Voorbeeld", + "composer.discard": "Annuleren", + "composer.submit": "Opslaan", + "composer.replying_to": "Reageren op", + "composer.new_topic": "Nieuw Onderwerp", + "composer.drag_and_drop_images": "Drag and Drop Images Here", + "composer.content_is_parsed_with": "Content is parsed with", + "composer.upload_instructions": "Upload images by dragging & dropping them." +} \ No newline at end of file diff --git a/public/language/nl/unread.json b/public/language/nl/unread.json new file mode 100644 index 0000000000..ce0b9a43e9 --- /dev/null +++ b/public/language/nl/unread.json @@ -0,0 +1,6 @@ +{ + "title": "Ongelezen", + "no_unread_topics": "Er zijn geen ongelezen onderwerpen", + "mark_all_read": "Alles markeren als Gelezen", + "load_more": "Meer Laden" +} \ No newline at end of file diff --git a/public/language/nl/user.json b/public/language/nl/user.json new file mode 100644 index 0000000000..ec931aee06 --- /dev/null +++ b/public/language/nl/user.json @@ -0,0 +1,47 @@ +{ + "banned": "Verbannen", + "offline": "Offline", + "username": "Gebruikersnaam", + "email": "Email", + "fullname": "Volledige Naam", + "website": "Website", + "location": "Locatie", + "age": "Leeftijd", + "joined": "Geregistreerd", + "lastonline": "Laatst Online", + "profile": "Profiel", + "profile_views": "Profiel weergaven", + "reputation": "Reputatie", + "posts": "Berichten", + "favourites": "Favorieten", + "followers": "Volgers", + "following": "Volgend", + "signature": "Handtekening", + "gravatar": "Gravatar", + "birthday": "Verjaardag", + "chat": "Chat", + "follow": "Follow", + "unfollow": "Unfollow", + "change_picture": "Afbeelding Aanpassen", + "edit": "Aanpassen", + "uploaded_picture": "Afbeelding Uploaden", + "upload_new_picture": "Nieuwe Afbeelding Uploaden", + "current_password": "Current Password", + "change_password": "Wachtwoord Aanpassen", + "confirm_password": "Bevestig Wachtwoord", + "password": "Wachtwoord", + "upload_picture": "Afbeelding Uploaden", + "upload_a_picture": "Upload een afbeelding", + "image_spec": "You may only upload PNG, JPG, or GIF files", + "max": "max.", + "settings": "Instellingen", + "show_email": "Laat Mijn Email Zien", + "has_no_follower": "Deze gebruiker heeft geen volgers :(", + "follows_no_one": "Deze gebruiker volgt niemand :(", + "has_no_posts": "Deze gebruiker heeft nog geen berichten geplaatst", + "email_hidden": "Email Verborgen", + "hidden": "verborgen", + "paginate_description": "Paginate topics and posts instead of using infinite scroll.", + "topics_per_page": "Topics per Page", + "posts_per_page": "Posts per Page" +} \ No newline at end of file diff --git a/public/language/nl/users.json b/public/language/nl/users.json new file mode 100644 index 0000000000..613f94a45d --- /dev/null +++ b/public/language/nl/users.json @@ -0,0 +1,9 @@ +{ + "latest_users": "Nieuwste Gebruikers", + "top_posters": "Meest Actief", + "most_reputation": "Meeste Reputatie", + "online": "Online", + "search": "Zoeken", + "enter_username": "Vul een gebruikersnaam in om te zoeken", + "load_more": "Meer Laden" +} \ No newline at end of file From 8da7a6f2f385df7d357c11f013678b41a24c3019 Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Wed, 26 Feb 2014 15:32:32 -0500 Subject: [PATCH 07/19] cleanup --- src/categories.js | 2 +- src/favourites.js | 49 +++++------------------- src/socket.io/posts.js | 46 +++++++++++++---------- src/topics.js | 84 ++++++++++++------------------------------ 4 files changed, 62 insertions(+), 119 deletions(-) diff --git a/src/categories.js b/src/categories.js index da9f84a8af..5eafaff6cb 100644 --- a/src/categories.js +++ b/src/categories.js @@ -424,6 +424,6 @@ var db = require('./database'), Categories.addActiveUser(cid, uid, timestamp); }); - } + }; }(exports)); \ No newline at end of file diff --git a/src/favourites.js b/src/favourites.js index 7792cee454..8084647bdd 100644 --- a/src/favourites.js +++ b/src/favourites.js @@ -153,24 +153,13 @@ var async = require('async'), downvoted: function(next) { db.isSetMember('pid:' + pid + ':downvote', uid, next); } - }, function(err, results) { - callback(err, results) - }); + }, callback); }; Favourites.getVoteStatusByPostIDs = function(pids, uid, callback) { - var data = {}; - - function iterator(pid, next) { - Favourites.hasVoted(pid, uid, function(err, voteStatus) { - data[pid] = voteStatus; - next() - }); - } - - async.each(pids, iterator, function(err) { - callback(data); - }); + async.map(pids, function(pid, next) { + Favourites.hasVoted(pid, uid, next); + }, callback); }; Favourites.favourite = function (pid, room_id, uid, socket) { @@ -248,33 +237,15 @@ var async = require('async'), }; Favourites.getFavouritesByPostIDs = function(pids, uid, callback) { - var data = {}; - - function iterator(pid, next) { - Favourites.hasFavourited(pid, uid, function(err, hasFavourited) { - data[pid] = hasFavourited; - next() - }); - } - - async.each(pids, iterator, function(err) { - callback(data); - }); + async.map(pids, function(pid, next) { + Favourites.hasFavourited(pid, uid, next); + }, callback); }; Favourites.getFavouritedUidsByPids = function(pids, callback) { - var data = {}; - - function getUids(pid, next) { - db.getSetMembers('pid:' + pid + ':users_favourited', function(err, uids) { - data[pid] = uids; - next(); - }); - } - - async.each(pids, getUids, function(err) { - callback(data); - }); + async.map(pids, function(pid, next) { + db.getSetMembers('pid:' + pid + ':users_favourited', next); + }, callback) }; }(exports)); \ No newline at end of file diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js index 7a0475354e..049735b71c 100644 --- a/src/socket.io/posts.js +++ b/src/socket.io/posts.js @@ -207,30 +207,38 @@ SocketPosts.getPrivileges = function(socket, pid, callback) { SocketPosts.getFavouritedUsers = function(socket, pid, callback) { - favourites.getFavouritedUidsByPids([pid], function(data) { + favourites.getFavouritedUidsByPids([pid], function(err, data) { + + if(err) { + return callback(err); + } + + if(!Array.isArray(data) || !data.length) { + callback(null, ""); + } + + console.log(data); var max = 5; //hardcoded var usernames = ""; - var pid_uids = data[pid]; + var pid_uids = data[0]; var rest_amount = 0; - if (data.hasOwnProperty(pid) && pid_uids.length > 0) { - if (pid_uids.length > max) { - rest_amount = pid_uids.length - max; - pid_uids = pid_uids.slice(0, max); - } - user.getUsernamesByUids(pid_uids, function(err, result) { - if(err) { - return callback(err); - } - - usernames = result.join(', ') + (rest_amount > 0 - ? " and " + rest_amount + (rest_amount > 1 ? " others" : " other") - : ""); - callback(null, usernames); - }); - } else { - callback(null, ""); + + if (pid_uids.length > max) { + rest_amount = pid_uids.length - max; + pid_uids = pid_uids.slice(0, max); } + + user.getUsernamesByUids(pid_uids, function(err, result) { + if(err) { + return callback(err); + } + + usernames = result.join(', ') + (rest_amount > 0 + ? " and " + rest_amount + (rest_amount > 1 ? " others" : " other") + : ""); + callback(null, usernames); + }); }); }; diff --git a/src/topics.js b/src/topics.js index 05d12787b8..fe062b8b52 100644 --- a/src/topics.js +++ b/src/topics.js @@ -350,12 +350,7 @@ var async = require('async'), }); }; - Topics.getTopicPosts = function(tid, start, end, current_user, reverse, callback) { - if (typeof reverse === 'function') { - callback = reverse; - reverse = false; - } - + Topics.getTopicPosts = function(tid, start, end, uid, reverse, callback) { posts.getPostsByTid(tid, start, end, reverse, function(err, postData) { if(err) { return callback(err); @@ -373,65 +368,34 @@ var async = require('async'), return post.pid; }); - function getFavouritesData(next) { - favourites.getFavouritesByPostIDs(pids, current_user, function(fav_data) { - next(null, fav_data); - }); - } - - function getVoteStatusData(next) { - favourites.getVoteStatusByPostIDs(pids, current_user, function(vote_data) { - next(null, vote_data); - }) - } - - function addUserInfoToPosts(next) { - function iterator(post, callback) { - posts.addUserInfoToPost(post, function() { - callback(null); - }); - } - - async.each(postData, iterator, function(err) { - next(err, null); - }); - } - - function getPrivileges(next) { - var privs = {}; - async.each(pids, getPostPrivileges, function(err) { - next(err, privs); - }); - - function getPostPrivileges(pid, next) { - postTools.privileges(pid, current_user, function(err, postPrivileges) { - if(err) { - return next(err); - } - privs[pid] = postPrivileges; - next(); - }); + async.parallel({ + favourites : function(next) { + favourites.getFavouritesByPostIDs(pids, uid, next); + }, + voteData : function(next) { + favourites.getVoteStatusByPostIDs(pids, uid, next); + }, + userData : function(next) { + async.each(postData, posts.addUserInfoToPost, next); + }, + privileges : function(next) { + async.map(pids, function (pid, next) { + postTools.privileges(pid, uid, next); + }, next); } - } - - async.parallel([getFavouritesData, addUserInfoToPosts, getPrivileges, getVoteStatusData], function(err, results) { + }, function(err, results) { if(err) { return callback(err); } - var fav_data = results[0], - privileges = results[2], - voteStatus = results[3]; - for (var i = 0; i < postData.length; ++i) { - var pid = postData[i].pid; - postData[i].favourited = fav_data[pid]; - postData[i].upvoted = voteStatus[pid].upvoted; - postData[i].downvoted = voteStatus[pid].downvoted; + postData[i].favourited = results.favourites[i]; + postData[i].upvoted = results.voteData[i].upvoted; + postData[i].downvoted = results.voteData[i].downvoted; postData[i].votes = postData[i].votes || 0; - postData[i].display_moderator_tools = (current_user != 0) && privileges[pid].editable; - postData[i].display_move_tools = privileges[pid].move; - if(parseInt(postData[i].deleted, 10) === 1 && !privileges[pid].view_deleted) { + postData[i].display_moderator_tools = (uid != 0) && results.privileges[i].editable; + postData[i].display_move_tools = results.privileges[i].move; + if(parseInt(postData[i].deleted, 10) === 1 && !results.privileges[i].view_deleted) { postData[i].content = 'This post is deleted!'; } } @@ -696,7 +660,7 @@ var async = require('async'), function isTopicVisible(topicData, topicInfo) { var deleted = parseInt(topicData.deleted, 10) !== 0; - return !deleted || (deleted && topicInfo.privileges.view_deleted) || topicData.uid === current_user; + return !deleted || (deleted && topicInfo.privileges.view_deleted) || parseInt(topicData.uid, 10) === parseInt(current_user, 10); } function loadTopic(tid, next) { @@ -765,7 +729,7 @@ var async = require('async'), } function getTopicPosts(next) { - Topics.getTopicPosts(tid, start, end, current_user, next); + Topics.getTopicPosts(tid, start, end, current_user, false, next); } function getPrivileges(next) { From 5145ba1aaca8ea9fa5272e4c74d9ab4456b59a32 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 26 Feb 2014 15:58:42 -0500 Subject: [PATCH 08/19] added a route to get moderators by category id --- src/routes/api.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/routes/api.js b/src/routes/api.js index 7cdd7a8589..2d22903989 100644 --- a/src/routes/api.js +++ b/src/routes/api.js @@ -503,6 +503,14 @@ var path = require('path'), app.get('/500', function(req, res) { res.json({errorMessage: 'testing'}); }); + + app.namespace('/categories', function() { + app.get(':cid/moderators', function(req, res) { + categories.getModerators(req.params.cid, function(err, moderators) { + res.json({moderators: moderators}); + }) + }); + }); }); } }(exports)); From ea6cf3bbd576be7a9f06f155fc804b14f58daf55 Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Wed, 26 Feb 2014 16:43:21 -0500 Subject: [PATCH 09/19] more cleanup and changes to topics --- public/templates/category.tpl | 12 +-- public/templates/noscript/category.tpl | 6 +- public/templates/noscript/topic.tpl | 4 +- public/templates/topic.tpl | 12 +-- src/categories.js | 42 ++++------ src/routes/api.js | 53 ++++++++----- src/routes/feeds.js | 12 +-- src/socket.io/posts.js | 1 - src/socket.io/topics.js | 2 +- src/topics.js | 103 +++++++++---------------- src/webserver.js | 16 ++-- tests/categories.js | 4 +- 12 files changed, 119 insertions(+), 148 deletions(-) diff --git a/public/templates/category.tpl b/public/templates/category.tpl index 24afd18f2d..d536a201cb 100644 --- a/public/templates/category.tpl +++ b/public/templates/category.tpl @@ -1,9 +1,15 @@ + + + + + +

    2. - {category_name} + {name}
    @@ -109,7 +115,3 @@
- - - - \ No newline at end of file diff --git a/public/templates/noscript/category.tpl b/public/templates/noscript/category.tpl index ccfeffd740..52122e121c 100644 --- a/public/templates/noscript/category.tpl +++ b/public/templates/noscript/category.tpl @@ -3,17 +3,17 @@
  • - {category_name} + {name}