From 6d1ec8c7feb2fcef82e5cbc0dc4f1e9a7ea48381 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 11 Feb 2014 09:35:41 -0500 Subject: [PATCH 1/2] hebrew translations by orweinberger --- public/language/he/notifications.json | 4 ++-- public/language/he/recent.json | 2 +- public/language/he/topic.json | 34 +++++++++++++-------------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/public/language/he/notifications.json b/public/language/he/notifications.json index 1b0c6ddfe2..98527a734e 100644 --- a/public/language/he/notifications.json +++ b/public/language/he/notifications.json @@ -1,7 +1,7 @@ { "title": "התראות", - "no_notifs": "You have no notifications", - "see_all": "See all Notifications", + "no_notifs": "אין התראות", + "see_all": "צפה בכל ההתראות", "back_to_home": "חזרה ל NodeBB", "outgoing_link": "לינק", "outgoing_link_message": "אתה כעת עוזב", diff --git a/public/language/he/recent.json b/public/language/he/recent.json index 2b2ab609e1..19a0b19559 100644 --- a/public/language/he/recent.json +++ b/public/language/he/recent.json @@ -3,5 +3,5 @@ "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/he/topic.json b/public/language/he/topic.json index ddad8c3b58..040adbd6e7 100644 --- a/public/language/he/topic.json +++ b/public/language/he/topic.json @@ -2,7 +2,7 @@ "topic": "נושא", "topics": "נושאים", "no_topics_found": "לא נמצאו נושאים!", - "no_posts_found": "No posts found!", + "no_posts_found": "לא נמצאו פוסטים!", "profile": "פרופיל", "posted_by": "פורסם על-ידי", "chat": "צ'אט", @@ -19,17 +19,17 @@ "tools": "כלים", "flag": "דווח", "flag_title": "דווח על פוסט זה למנהל", - "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", + "deleted_message": "הנושא הזה נמחק. רק מנהלים מורשים לראות אותו", "thread_tools.title": "כלים", "thread_tools.markAsUnreadForAll": "סמן כלא נקרא", - "thread_tools.pin": "Pin Topic", - "thread_tools.unpin": "Unpin Topic", - "thread_tools.lock": "Lock Topic", - "thread_tools.unlock": "Unlock Topic", - "thread_tools.move": "Move Topic", - "thread_tools.fork": "Fork Topic", - "thread_tools.delete": "Delete Topic", - "thread_tools.restore": "Restore Topic", + "thread_tools.pin": "נעץ נושא", + "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": "הזז", @@ -53,11 +53,11 @@ "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": "נושא חדש" } \ No newline at end of file From 01f7caa3af530c33c2628ffd0fa79860bd82758e Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 11 Feb 2014 10:57:51 -0500 Subject: [PATCH 2/2] Proper handling of windows path separators in plugin js gets --- src/meta.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/meta.js b/src/meta.js index 7f1e496de7..13a6c8f41c 100644 --- a/src/meta.js +++ b/src/meta.js @@ -247,8 +247,10 @@ var fs = require('fs'), plugins.fireHook('filter:scripts.get', this.scripts, function(err, scripts) { var mtime, jsPaths = scripts.map(function (jsPath) { + jsPath = path.normalize(jsPath); + if (jsPath.substring(0, 7) === 'plugins') { - var paths = jsPath.split('/'), + var paths = jsPath.split(path.sep), mappedPath = paths[1]; if (plugins.staticDirs[mappedPath]) {