From 610d687a96fef5a3c59bad069bea7bd09aa395b6 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 21 Apr 2015 14:32:36 -0400 Subject: [PATCH 1/3] moved favicon into default link tags, and fixed bug that caused link tags to not show up --- src/meta/tags.js | 9 ++++----- src/middleware/middleware.js | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/meta/tags.js b/src/meta/tags.js index 165851820b..022a3ef778 100644 --- a/src/meta/tags.js +++ b/src/meta/tags.js @@ -31,6 +31,10 @@ module.exports = function(Meta) { content: Meta.config['brand:logo'] || '' }]), async.apply(plugins.fireHook, 'filter:meta.getLinkTags', [{ + rel: "icon", + type: "image/x-icon", + href: nconf.get('relative_path') + '/favicon.ico' + }, { rel: 'apple-touch-icon', href: nconf.get('relative_path') + '/apple-touch-icon' }]) @@ -46,11 +50,6 @@ module.exports = function(Meta) { }); link = tags[1].concat(link || []); - link.unshift({ - rel: "icon", - type: "image/x-icon", - href: nconf.get('relative_path') + '/favicon.ico' - }); callback(null, { meta: meta, diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js index 7ef23b28b0..9e400de9b7 100644 --- a/src/middleware/middleware.js +++ b/src/middleware/middleware.js @@ -270,7 +270,7 @@ middleware.renderHeader = function(req, res, callback) { templateValues.browserTitle = results.title; templateValues.navigation = results.navigation templateValues.metaTags = results.tags.meta; - templateValues.metalinkTags = results.tags.link; + templateValues.linkTags = results.tags.link; templateValues.isAdmin = results.user.isAdmin; templateValues.user = results.user; templateValues.userJSON = JSON.stringify(results.user); From 2f2e2d60a0ca8412c84a5eaaf04fa5d934a5411d Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 21 Apr 2015 15:37:36 -0400 Subject: [PATCH 2/3] updated translations --- public/language/nl/category.json | 6 +++--- public/language/nl/error.json | 6 +++--- public/language/nl/groups.json | 4 ++-- public/language/nl/modules.json | 8 ++++---- public/language/nl/pages.json | 2 +- public/language/nl/reset_password.json | 2 +- public/language/nl/search.json | 2 +- public/language/nl/user.json | 16 ++++++++-------- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/public/language/nl/category.json b/public/language/nl/category.json index 006419994c..afb8eb21c8 100644 --- a/public/language/nl/category.json +++ b/public/language/nl/category.json @@ -5,8 +5,8 @@ "browsing": "verkennen", "no_replies": "Niemand heeft gereageerd", "share_this_category": "Deel deze categorie", - "watch": "Watch", + "watch": "Volgen", "ignore": "Negeren", - "watch.message": "You are now watching updates from this category", - "ignore.message": "You are now ignoring updates from this category" + "watch.message": "Je krijgt nu updates binnen van deze categorie", + "ignore.message": "Je krijgt geen updates meer binnen van deze categorie" } \ No newline at end of file diff --git a/public/language/nl/error.json b/public/language/nl/error.json index 04ffc07151..bfc1d5c320 100644 --- a/public/language/nl/error.json +++ b/public/language/nl/error.json @@ -21,7 +21,7 @@ "email-not-confirmed-chat": "U kunt helaas geen gebruik maken van chats tot uw email adres bevestigd is.", "no-email-to-confirm": "Dit forum vereist email bevestiging, klikt u alstublieft hier om uw email te vermelden", "email-confirm-failed": "Uw email kon helaas niet bevestigd worden, probeert u het alstublieft later nog eens.", - "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minutes to send another one.", + "confirm-email-already-sent": "Bevestigingsmailtje is al verzonden, wacht %1 minuut/minuten om nog 1 te verzenden", "username-too-short": "Gebruikersnaam is te kort", "username-too-long": "Gebruikersnaam is te lang", "user-banned": "Gebruiker verbannen", @@ -46,7 +46,7 @@ "too-many-posts-newbie": "Als een nieuwe gebruiker kan je maar om de %1 seconden een bericht plaatsen vanwege je reputatie. Uw moet deze level van reputatie verdienen %2. Wacht alstublieft met het plaatsen van uw bericht.", "tag-too-short": "Maakt u alstublieft de tag iets langer. Tags dienen minimaal %1 karakters te bevatten", "tag-too-long": "Maakt u alstublieft de tag iets korter. Tags mogen maximaal %1 karakters bevatten", - "file-too-big": "Maximum allowed file size is %1 kb - please upload a smaller file", + "file-too-big": "De maximale bestandsgrootte is %1 kbs", "cant-vote-self-post": "Je kan niet op je eigen berichten stemmen", "already-favourited": "U heeft al dit bericht in uw favorieten staan", "already-unfavourited": "U heeft al dit bericht uit uw favorieten gehaald", @@ -63,7 +63,7 @@ "post-already-restored": "Dit bericht is al hersteld", "topic-already-deleted": "Deze topic is al verwijderd", "topic-already-restored": "Deze topic is al hersteld", - "cant-purge-main-post": "You can't purge the main post, please delete the topic instead", + "cant-purge-main-post": "Je kan het beginbericht niet verwijderen. Verwijder het onderwerp hiervoor.", "topic-thumbnails-are-disabled": "Onderwerp thumbnails zijn uitgeschakeld", "invalid-file": "Ongeldig bestand", "uploads-are-disabled": "Uploads zijn uitgeschakeld", diff --git a/public/language/nl/groups.json b/public/language/nl/groups.json index 55329f7460..8fbbbee137 100644 --- a/public/language/nl/groups.json +++ b/public/language/nl/groups.json @@ -20,8 +20,8 @@ "details.kick": "Verwijder", "details.owner_options": "Groeps Administratie", "details.group_name": "Groepsnaam", - "details.member_count": "Member Count", - "details.creation_date": "Creation Date", + "details.member_count": "Leden telling", + "details.creation_date": "Datum van het creëeren", "details.description": "Beschrijving", "details.badge_preview": "Badge Voorvertoning", "details.change_icon": "Icoon veranderen", diff --git a/public/language/nl/modules.json b/public/language/nl/modules.json index b4ff78710f..76dd6413a9 100644 --- a/public/language/nl/modules.json +++ b/public/language/nl/modules.json @@ -15,12 +15,12 @@ "chat.seven_days": "7 Dagen", "chat.thirty_days": "30 Dagen", "chat.three_months": "3 Maanden", - "composer.compose": "Compose", - "composer.show_preview": "Show Preview", - "composer.hide_preview": "Hide Preview", + "composer.compose": "samenstellen", + "composer.show_preview": "Laat voorbeeld zien", + "composer.hide_preview": "Verberg voorbeeld", "composer.user_said_in": "%1 zegt in %2:", "composer.user_said": "%1 zegt:", "composer.discard": "Weet u het zeker dat u dit bericht niet wilt plaatsen?", "composer.submit_and_lock": "Plaatsen en vergrendelen", - "composer.toggle_dropdown": "Toggle Dropdown" + "composer.toggle_dropdown": "pin menu" } \ No newline at end of file diff --git a/public/language/nl/pages.json b/public/language/nl/pages.json index 955675f48d..f9db18bd4c 100644 --- a/public/language/nl/pages.json +++ b/public/language/nl/pages.json @@ -6,7 +6,7 @@ "users": "Geregistreerde Gebruikers", "notifications": "Notificaties", "tags": "Tags", - "tag": "Topics tagged under \"%1\"", + "tag": "Onderwerpen getagd onder \"%1\"", "user.edit": "\"%1\" aanpassen", "user.following": "Mensen %1 Volgt", "user.followers": "Mensen die %1 Volgen", diff --git a/public/language/nl/reset_password.json b/public/language/nl/reset_password.json index 3844bbb12f..87a167b975 100644 --- a/public/language/nl/reset_password.json +++ b/public/language/nl/reset_password.json @@ -13,5 +13,5 @@ "invalid_email": "Fout Email Adres / Email Adres bestaat niet!", "password_too_short": "Het ingegeven wachtwoord is te kort. Kiest u alstublieft een ander wachtwoord.", "passwords_do_not_match": "De twee wachtwoorden die u heeft ingegeven komen niet overeen.", - "password_expired": "Your password has expired, please choose a new password" + "password_expired": "U wachtwoord is verlopen, kies een nieuw wachtwoord" } \ No newline at end of file diff --git a/public/language/nl/search.json b/public/language/nl/search.json index 5a4a2c8210..91d52f12a2 100644 --- a/public/language/nl/search.json +++ b/public/language/nl/search.json @@ -1,7 +1,7 @@ { "results_matching": "%1 resulta(a)ten was een match \"%2\", (%3 seconds)", "no-matches": "Geen matches gevonden", - "advanced-search": "Advanced Search", + "advanced-search": "Geavanceerd Zoeken", "in": "in", "titles": "Titels", "titles-posts": "Titels en Berichten", diff --git a/public/language/nl/user.json b/public/language/nl/user.json index 9537ef0f2c..d30ff024a9 100644 --- a/public/language/nl/user.json +++ b/public/language/nl/user.json @@ -27,7 +27,7 @@ "chat": "Chat", "follow": "Volgen", "unfollow": "Ontvolgen", - "more": "More", + "more": "Meer", "profile_update_success": "Uw profiel is succesvol geüpdatet", "change_picture": "Afbeelding Aanpassen", "edit": "Aanpassen", @@ -68,16 +68,16 @@ "has_no_watched_topics": "Deze gebruiker heeft nog geen berichten bekeken", "email_hidden": "Email Verborgen", "hidden": "verborgen", - "paginate_description": "Paginate topics and posts instead of using infinite scroll", + "paginate_description": "Blader door onderwerpen en berichten in plaats van oneindig scrollen.", "topics_per_page": "Onderwerpen per Pagina", "posts_per_page": "Berichten per Pagina", - "notification_sounds": "Play a sound when you receive a notification", + "notification_sounds": "Speel een geluid af wanneer ik een notificatie ontvang.", "browsing": "Zoek Instellingen", - "open_links_in_new_tab": "Open outgoing links in new tab", + "open_links_in_new_tab": "Open de uitgaande links in een nieuw tabblad", "enable_topic_searching": "Zet zoeken in het onderwerp aan", - "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen", - "follow_topics_you_reply_to": "Follow topics that you reply to", - "follow_topics_you_create": "Follow topics you create", + "topic_search_help": "Als het is ingeschakeld, dan zal het standaard zoeken overschrijven en zal je vanaf nu het gehele onderwerp kunnen doorzoeken ipv wat je standaard ziet.", + "follow_topics_you_reply_to": "Volg de onderwerpen waarop u gereageerd heeft.", + "follow_topics_you_create": "Volg de onderwerpen die u gecreëerd heeft.", "grouptitle": "Selecteer de groepstitel die u wilt weergeven ", - "no-group-title": "No group title" + "no-group-title": "Geen groepstitel" } \ No newline at end of file From 3ffd3a5d3c6df879f7a3f0088bd179544cbf43ac Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 21 Apr 2015 16:26:24 -0400 Subject: [PATCH 3/3] closes #2970, closes #3078 --- public/src/client/topic/events.js | 11 +++-------- src/privileges/posts.js | 2 +- src/threadTools.js | 3 +-- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.js index 80df64dc6d..d40fc776a1 100644 --- a/public/src/client/topic/events.js +++ b/public/src/client/topic/events.js @@ -1,7 +1,7 @@ 'use strict'; -/* globals config, app, ajaxify, define, socket, templates */ +/* globals config, app, ajaxify, define, socket, templates, translator, utils */ define('forum/topic/events', [ 'forum/topic/browsing', @@ -20,8 +20,8 @@ define('forum/topic/events', [ 'event:voted': updatePostVotesAndUserReputation, 'event:favourited': updateFavouriteCount, - 'event:topic_deleted': toggleTopicDeleteState, - 'event:topic_restored': toggleTopicDeleteState, + 'event:topic_deleted': threadTools.setDeleteState, + 'event:topic_restored': threadTools.setDeleteState, 'event:topic_purged': onTopicPurged, 'event:topic_locked': threadTools.setLockedState, @@ -81,11 +81,6 @@ define('forum/topic/events', [ $('[data-pid="' + data.post.pid + '"] .favouriteCount').html(data.post.reputation).attr('data-favourites', data.post.reputation); } - function toggleTopicDeleteState(data) { - threadTools.setLockedState(data); - threadTools.setDeleteState(data); - } - function onTopicPurged(data) { ajaxify.go('category/' + ajaxify.variables.get('category_id')); } diff --git a/src/privileges/posts.js b/src/privileges/posts.js index 8dfd89bff2..f39de4e08e 100644 --- a/src/privileges/posts.js +++ b/src/privileges/posts.js @@ -109,7 +109,7 @@ module.exports = function(privileges) { return callback(null, true); } if (results.isEditable.isLocked) { - return callback(new Error('[[error:topic-locked]]]')); + return callback(new Error('[[error:topic-locked]]')); } if (results.isEditable.isEditExpired) { return callback(new Error('[[error:post-edit-duration-expired, ' + meta.config.postEditDuration + ']]')); diff --git a/src/threadTools.js b/src/threadTools.js index 1a8016a2e2..ea66ac9239 100644 --- a/src/threadTools.js +++ b/src/threadTools.js @@ -36,7 +36,7 @@ var async = require('async'), return callback(err); } topicData.deleted = isDelete ? 1 : 0; - ThreadTools[isDelete ? 'lock' : 'unlock'](tid, uid); + if (isDelete) { plugins.fireHook('action:topic.delete', tid); } else { @@ -47,7 +47,6 @@ var async = require('async'), tid: tid, cid: topicData.cid, isDelete: isDelete, - isLocked: isDelete, uid: uid };