Merge remote-tracking branch 'origin/master' into secondary_database
Conflicts: src/database/level/main.jsv1.18.x
psychobunny
11 years ago
commit
74674c8494
@ -1,5 +1,5 @@
|
||||
{
|
||||
"topic-post": "You have successfully posted.",
|
||||
"authentication-successful": "Authentication Successful"
|
||||
|
||||
"authentication-successful": "Authentication Successful",
|
||||
"settings-saved": "Settings saved!"
|
||||
}
|
||||
@ -0,0 +1,12 @@
|
||||
{
|
||||
"new_topic_button": "New Topic",
|
||||
"no_topics": "<strong>There are no topics in this category.</strong><br />Why don't you try posting one?",
|
||||
"posts": "posts",
|
||||
"views": "views",
|
||||
"posted": "posted",
|
||||
"browsing": "browsing",
|
||||
"no_replies": "No one has replied",
|
||||
"replied": "replied",
|
||||
"last_edited_by": "last edited by",
|
||||
"share_this_category": "Share this category"
|
||||
}
|
||||
@ -0,0 +1,7 @@
|
||||
{
|
||||
"stats.online": "Online",
|
||||
"stats.users": "Users",
|
||||
"stats.topics": "Topics",
|
||||
"stats.posts": "Posts",
|
||||
"success": "success"
|
||||
}
|
||||
@ -0,0 +1,55 @@
|
||||
{
|
||||
"home": "Home",
|
||||
"search": "Search",
|
||||
"buttons.close": "Close",
|
||||
"403.title": "Access Denied",
|
||||
"403.message": "You seem to have stumbled upon a page that you do not have access to. Perhaps you should <a href='/login'>try logging in</a>?",
|
||||
"404.title": "Not Found",
|
||||
"404.message": "You seem to have stumbled upon a page that does not exist. Return to the <a href='/'>home page</a>.",
|
||||
"500.title": "Internal error.",
|
||||
"500.message": "Oops! Looks like something went wrong!",
|
||||
"register": "Register",
|
||||
"login": "Login",
|
||||
"please_log_in": "Please Log In",
|
||||
"logout": "Logout",
|
||||
"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",
|
||||
"save_changes": "Save Changes",
|
||||
"close": "Close",
|
||||
"pagination": "Pagination",
|
||||
"header.admin": "Admin",
|
||||
"header.recent": "Recent",
|
||||
"header.unread": "Unread",
|
||||
"header.popular": "Popular",
|
||||
"header.users": "Users",
|
||||
"header.chats": "Chats",
|
||||
"header.notifications": "Notifications",
|
||||
"header.search": "Search",
|
||||
"header.profile": "Profile",
|
||||
"notifications.loading": "Loading Notifications",
|
||||
"chats.loading": "Loading Chats",
|
||||
"motd.welcome": "Welcome to NodeBB, the discussion platform of the future.",
|
||||
"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",
|
||||
"norecentposts": "No Recent Posts",
|
||||
"norecenttopics": "No Recent Topics",
|
||||
"recentposts": "Recent Posts",
|
||||
"recentips": "Recently Logged In IPs",
|
||||
"online": "Online",
|
||||
"away": "Away",
|
||||
"dnd": "Do not Disturb",
|
||||
"invisible": "Invisible",
|
||||
"offline": "Offline",
|
||||
"privacy": "Privacy"
|
||||
}
|
||||
@ -0,0 +1,5 @@
|
||||
{
|
||||
"name": "English (United States)",
|
||||
"code": "en_US",
|
||||
"dir": "ltr"
|
||||
}
|
||||
@ -0,0 +1,10 @@
|
||||
{
|
||||
"login": "Login",
|
||||
"username": "Username / Email",
|
||||
"password": "Password",
|
||||
"remember_me": "Remember Me?",
|
||||
"forgot_password": "Forgot Password?",
|
||||
"alternative_logins": "Alternative Logins",
|
||||
"failed_login_attempt": "Failed login attempt, please try again.",
|
||||
"login_successful": "You have successfully logged in!"
|
||||
}
|
||||
@ -0,0 +1,6 @@
|
||||
{
|
||||
"chat.chatting_with": "Chat with <span id=\"chat-with-name\"></span>",
|
||||
"chat.placeholder": "type chat message here, press enter to send",
|
||||
"chat.send": "Send",
|
||||
"chat.no_active": "You have no active chats."
|
||||
}
|
||||
@ -0,0 +1,10 @@
|
||||
{
|
||||
"title": "Notifications",
|
||||
"no_notifs": "You have no new notifications",
|
||||
"see_all": "See all Notifications",
|
||||
"back_to_home": "Back to NodeBB",
|
||||
"outgoing_link": "Outgoing Link",
|
||||
"outgoing_link_message": "You are now leaving",
|
||||
"continue_to": "Continue to",
|
||||
"return_to": "Return to "
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
{
|
||||
"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.posts": "Posts made by %1",
|
||||
"user.topics": "Topics created by %1",
|
||||
"user.favourites": "%1's Favorite Posts",
|
||||
"user.settings": "User Settings"
|
||||
}
|
||||
@ -0,0 +1,7 @@
|
||||
{
|
||||
"title": "Recent",
|
||||
"day": "Day",
|
||||
"week": "Week",
|
||||
"month": "Month",
|
||||
"no_recent_topics": "There are no recent topics."
|
||||
}
|
||||
@ -0,0 +1,18 @@
|
||||
{
|
||||
"register": "Register",
|
||||
"help.email": "By default, your email will be hidden from the public.",
|
||||
"help.username_restrictions": "A unique username between %1 and %2 characters. Others can mention you with @<span id='yourUsername'>username</span>.",
|
||||
"help.minimum_password_length": "Your password's length must be at least %1 characters.",
|
||||
"email_address": "Email Address",
|
||||
"email_address_placeholder": "Enter Email Address",
|
||||
"username": "Username",
|
||||
"username_placeholder": "Enter Username",
|
||||
"password": "Password",
|
||||
"password_placeholder": "Enter Password",
|
||||
"confirm_password": "Confirm Password",
|
||||
"confirm_password_placeholder": "Confirm Password",
|
||||
"register_now_button": "Register Now",
|
||||
"alternative_registration": "Alternative Registration",
|
||||
"terms_of_use": "Terms of Use",
|
||||
"agree_to_terms_of_use": "I agree to the Terms of Use"
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
{
|
||||
"reset_password": "Reset Password",
|
||||
"update_password": "Update Password",
|
||||
"password_changed.title": "Password Changed",
|
||||
"password_changed.message": "<p>Password successfully reset, please <a href=\"/login\">log in again</a>.",
|
||||
"wrong_reset_code.title": "Incorrect Reset Code",
|
||||
"wrong_reset_code.message": "The reset code received was incorrect. Please try again, or <a href=\"/reset\">request a new reset code</a>.",
|
||||
"new_password": "New Password",
|
||||
"repeat_password": "Confirm Password",
|
||||
"enter_email": "Please enter your <strong>email address</strong> and we will send you an email with instructions on how to reset your account.",
|
||||
"enter_email_address": "Enter Email Address",
|
||||
"password_reset_sent": "Password Reset Sent",
|
||||
"invalid_email": "Invalid Email / Email does not exist!"
|
||||
}
|
||||
@ -0,0 +1,93 @@
|
||||
{
|
||||
"topic": "Topic",
|
||||
"topics": "Topics",
|
||||
"topic_id": "Topic ID",
|
||||
"topic_id_placeholder": "Enter topic ID",
|
||||
"no_topics_found": "No topics found!",
|
||||
"no_posts_found": "No posts found!",
|
||||
"profile": "Profile",
|
||||
"posted_by": "Posted by",
|
||||
"chat": "Chat",
|
||||
"notify_me": "Be notified of new replies in this topic",
|
||||
"quote": "Quote",
|
||||
"reply": "Reply",
|
||||
"edit": "Edit",
|
||||
"delete": "Delete",
|
||||
"restore": "Restore",
|
||||
"move": "Move",
|
||||
"fork": "Fork",
|
||||
"banned": "banned",
|
||||
"link": "Link",
|
||||
"share": "Share",
|
||||
"tools": "Tools",
|
||||
"flag": "Flag",
|
||||
"bookmark_instructions": "Click here to return to your last position or close to discard.",
|
||||
"flag_title": "Flag this post for moderation",
|
||||
"flag_confirm": "Are you sure you want to flag this post?",
|
||||
"flag_success": "This post has been flagged for moderation.",
|
||||
"deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
|
||||
"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.",
|
||||
"markAsUnreadForAll.success": "Topic marked as unread for all.",
|
||||
"watch": "Watch",
|
||||
"watch.title": "Be notified of new replies in this topic",
|
||||
"share_this_post": "Share this Post",
|
||||
"thread_tools.title": "Thread Tools",
|
||||
"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.delete_confirm": "Are you sure you want to delete this thread?",
|
||||
"thread_tools.restore": "Restore Topic",
|
||||
"thread_tools.restore_confirm": "Are you sure you want to restore this thread?",
|
||||
"post_delete_confirm": "Are you sure you want to delete this post?",
|
||||
"post_restore_confirm": "Are you sure you want to restore this post?",
|
||||
"post_delete_error": "Could not delete this post!",
|
||||
"post_restore_error": "Could not restore this post!",
|
||||
"load_categories": "Loading Categories",
|
||||
"disabled_categories_note": "Disabled Categories are greyed out",
|
||||
"confirm_move": "Move",
|
||||
"confirm_fork": "Fork",
|
||||
"favourite": "Favorite",
|
||||
"favourites": "Favorites",
|
||||
"favourites.not_logged_in.title": "Not Logged In",
|
||||
"favourites.not_logged_in.message": "Please log in in order to favorite this post",
|
||||
"favourites.has_no_favourites": "You don't have any favorites, favorite some posts to see them here!",
|
||||
"vote.not_logged_in.title": "Not Logged In",
|
||||
"vote.not_logged_in.message": "Please log in in order to vote",
|
||||
"vote.cant_vote_self.title": "Invalid Vote",
|
||||
"vote.cant_vote_self.message": "You cannot vote for your own post",
|
||||
"loading_more_posts": "Loading More Posts",
|
||||
"move_topic": "Move Topic",
|
||||
"move_post": "Move Post",
|
||||
"fork_topic": "Fork Topic",
|
||||
"topic_will_be_moved_to": "This topic will be moved to the category",
|
||||
"fork_topic_instruction": "Click the posts you want to fork",
|
||||
"fork_no_pids": "No posts selected!",
|
||||
"fork_success": "Succesfully forked topic!",
|
||||
"reputation": "Reputation",
|
||||
"posts": "Posts",
|
||||
"composer.title_placeholder": "Enter your topic title here...",
|
||||
"composer.write": "Write",
|
||||
"composer.preview": "Preview",
|
||||
"composer.help": "Help",
|
||||
"composer.discard": "Discard",
|
||||
"composer.submit": "Submit",
|
||||
"composer.replying_to": "Replying to",
|
||||
"composer.new_topic": "New Topic",
|
||||
"composer.uploading": "uploading...",
|
||||
"composer.thumb_url_label": "Paste a topic thumbnail URL",
|
||||
"composer.thumb_title": "Add a thumbnail to this topic",
|
||||
"composer.thumb_url_placeholder": "http://example.com/thumb.png",
|
||||
"composer.thumb_file_label": "Or upload a file",
|
||||
"composer.thumb_remove": "Clear fields",
|
||||
"composer.drag_and_drop_images": "Drag and Drop Images Here",
|
||||
"composer.upload_instructions": "Upload images by dragging & dropping them."
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
{
|
||||
"title": "Unread",
|
||||
"no_unread_topics": "There are no unread topics.",
|
||||
"load_more": "Load More",
|
||||
"mark_as_read": "Mark as Read",
|
||||
"selected": "Selected",
|
||||
"all": "All",
|
||||
"topics_marked_as_read.success": "Topics marked as read!"
|
||||
}
|
||||
@ -0,0 +1,55 @@
|
||||
{
|
||||
"banned": "Banned",
|
||||
"offline": "Offline",
|
||||
"username": "User Name",
|
||||
"email": "Email",
|
||||
"fullname": "Full Name",
|
||||
"website": "Website",
|
||||
"location": "Location",
|
||||
"age": "Age",
|
||||
"joined": "Joined",
|
||||
"lastonline": "Last Online",
|
||||
"profile": "Profile",
|
||||
"profile_views": "Profile views",
|
||||
"reputation": "Reputation",
|
||||
"posts": "Posts",
|
||||
"favourites": "Favorites",
|
||||
"followers": "Followers",
|
||||
"following": "Following",
|
||||
"signature": "Signature",
|
||||
"gravatar": "Gravatar",
|
||||
"birthday": "Birthday",
|
||||
"chat": "Chat",
|
||||
"follow": "Follow",
|
||||
"unfollow": "Unfollow",
|
||||
"change_picture": "Change Picture",
|
||||
"edit": "Edit",
|
||||
"uploaded_picture": "Uploaded Picture",
|
||||
"upload_new_picture": "Upload New Picture",
|
||||
"current_password": "Current Password",
|
||||
"change_password": "Change Password",
|
||||
"change_password_error": "Invalid Password!",
|
||||
"change_password_error_wrong_current": "Your current password is not correct!",
|
||||
"change_password_error_length": "Password too short!",
|
||||
"change_password_error_match": "Passwords must match!",
|
||||
"change_password_error_privileges": "You are not have the rights to change this password.",
|
||||
"change_password_success": "Your password is updated!",
|
||||
"confirm_password": "Confirm Password",
|
||||
"password": "Password",
|
||||
"upload_picture": "Upload picture",
|
||||
"upload_a_picture": "Upload a picture",
|
||||
"image_spec": "You may only upload PNG, JPG, or GIF files",
|
||||
"max": "max.",
|
||||
"settings": "Settings",
|
||||
"show_email": "Show My Email",
|
||||
"has_no_follower": "This user doesn't have any followers :(",
|
||||
"follows_no_one": "This user isn't following anyone :(",
|
||||
"has_no_posts": "This user didn't post anything yet.",
|
||||
"has_no_topics": "This user didn't post any topics yet.",
|
||||
"email_hidden": "Email Hidden",
|
||||
"hidden": "hidden",
|
||||
"paginate_description": "Paginate topics and posts instead of using infinite scroll.",
|
||||
"topics_per_page": "Topics per Page",
|
||||
"posts_per_page": "Posts per Page",
|
||||
"notification_sounds": "Play a sound when you receive a notification."
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
{
|
||||
"latest_users": "Latest Users",
|
||||
"top_posters": "Top Posters",
|
||||
"most_reputation": "Most Reputation",
|
||||
"online": "Online",
|
||||
"search": "Search",
|
||||
"enter_username": "Enter a username to search",
|
||||
"load_more": "Load More"
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,106 +1,74 @@
|
||||
"use strict";
|
||||
/* global define, socket */
|
||||
/* global define, socket, config */
|
||||
|
||||
define(['buzz'], function(buzz) {
|
||||
var Sounds = {};
|
||||
|
||||
Sounds.initialised = false;
|
||||
Sounds.loaded = {};
|
||||
Sounds.mapping = {};
|
||||
|
||||
Sounds.init = function(callback) {
|
||||
var ready = false,
|
||||
onComplete = function() {
|
||||
Sounds.initialised = true;
|
||||
if (typeof callback === 'function') {
|
||||
callback();
|
||||
}
|
||||
};
|
||||
|
||||
loadFiles(function() {
|
||||
if (ready) {
|
||||
onComplete();
|
||||
} else {
|
||||
ready = true;
|
||||
}
|
||||
});
|
||||
var loadedSounds = {};
|
||||
var eventSoundMapping = {};
|
||||
var files = {};
|
||||
|
||||
loadMapping(function() {
|
||||
if (ready) {
|
||||
onComplete();
|
||||
} else {
|
||||
ready = true;
|
||||
}
|
||||
});
|
||||
loadFiles();
|
||||
|
||||
// Listen for reload message
|
||||
socket.on('event:sounds.reloadMapping', function() {
|
||||
loadMapping();
|
||||
});
|
||||
};
|
||||
loadMapping();
|
||||
|
||||
socket.on('event:sounds.reloadMapping', loadMapping);
|
||||
|
||||
var loadFiles = function(callback) {
|
||||
function loadFiles() {
|
||||
socket.emit('modules.sounds.getSounds', function(err, sounds) {
|
||||
if (err) {
|
||||
return console.log('[sounds] Could not initialise!');
|
||||
}
|
||||
|
||||
for(var name in sounds) {
|
||||
if (sounds.hasOwnProperty(name)) {
|
||||
var path = sounds[name];
|
||||
|
||||
Sounds.loaded[name] = new buzz.sound(path);
|
||||
}
|
||||
}
|
||||
|
||||
callback();
|
||||
files = sounds;
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
var loadMapping = function(callback) {
|
||||
function loadMapping() {
|
||||
socket.emit('modules.sounds.getMapping', function(err, mapping) {
|
||||
Sounds.mapping = mapping;
|
||||
if (typeof callback === 'function') {
|
||||
callback();
|
||||
if (err) {
|
||||
return console.log('[sounds] Could not load sound mapping!');
|
||||
}
|
||||
eventSoundMapping = mapping;
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
function isSoundLoaded(fileName) {
|
||||
return loadedSounds[fileName];
|
||||
}
|
||||
|
||||
function loadFile(fileName, callback) {
|
||||
if (isSoundLoaded(fileName)) {
|
||||
return callback();
|
||||
}
|
||||
|
||||
loadedSounds[fileName] = new buzz.sound(files[fileName]);
|
||||
callback();
|
||||
}
|
||||
|
||||
Sounds.play = function(name) {
|
||||
if (!config.notificationSounds) {
|
||||
return;
|
||||
}
|
||||
var ready = function() {
|
||||
if (Sounds.mapping[name] && Sounds.loaded[Sounds.mapping[name]]) {
|
||||
Sounds.loaded[Sounds.mapping[name]].play();
|
||||
} else {
|
||||
console.log('[sounds] Not found:', name);
|
||||
}
|
||||
};
|
||||
|
||||
if (!this.initialised) {
|
||||
this.init(ready);
|
||||
} else {
|
||||
ready();
|
||||
}
|
||||
|
||||
Sounds.playFile(eventSoundMapping[name]);
|
||||
};
|
||||
|
||||
Sounds.playFile = function(fileName) {
|
||||
var ready = function() {
|
||||
if (Sounds.loaded[fileName]) {
|
||||
Sounds.loaded[fileName].play();
|
||||
} else {
|
||||
console.log('[sounds] Not found:', name);
|
||||
}
|
||||
};
|
||||
|
||||
if (!this.initialised) {
|
||||
this.init(ready);
|
||||
function play() {
|
||||
if (loadedSounds[fileName]) {
|
||||
loadedSounds[fileName].play();
|
||||
} else {
|
||||
console.log('[sounds] Not found:', fileName);
|
||||
}
|
||||
}
|
||||
|
||||
if (isSoundLoaded(fileName)) {
|
||||
play();
|
||||
} else {
|
||||
ready();
|
||||
loadFile(fileName, play);
|
||||
}
|
||||
};
|
||||
|
||||
Sounds.init();
|
||||
return Sounds;
|
||||
});
|
||||
Loading…
Reference in New Issue