Baris Soner Usakli 11 years ago
commit fd3efd59f9

@ -1,6 +1,7 @@
{
"home": "Home",
"unread": "Unread Topics",
"popular": "Popular Topics",
"recent": "Recent Topics",
"users": "Registered Users",
"notifications": "Notifications",

@ -1,6 +1,7 @@
{
"home": "Home",
"unread": "Unread Topics",
"popular": "Popular Topics",
"recent": "Recent Topics",
"users": "Registered Users",
"notifications": "Notifications",

@ -10,14 +10,14 @@
"500.message": "Ooops! Looks like something went wrong!",
"register": "Registrierung",
"login": "Login",
"welcome_back": "Welcome Back ",
"you_have_successfully_logged_in": "You have successfully logged in",
"welcome_back": "Willkommen zurück",
"you_have_successfully_logged_in": "Du hast dich erfolgreich eingeloggt",
"logout": "Logout",
"logout.title": "Du bist ausgeloggt.",
"logout.message": "Du hast dich soeben erfolgreich aus dem Forum ausgeloggt.",
"save_changes": "Speichere Änderungen",
"close": "Schließen",
"pagination": "Pagination",
"pagination": "Seitennummerierung",
"header.admin": "Admin",
"header.recent": "Aktuell",
"header.unread": "Ungelesen",
@ -52,5 +52,5 @@
"dnd": "Nicht stören",
"invisible": "Unsichtbar",
"offline": "Offline",
"privacy": "Privacy"
"privacy": "Privatsphäre"
}

@ -1,7 +1,7 @@
{
"title": "Benachrichtigungen",
"no_notifs": "You have no new notifications",
"see_all": "See all Notifications",
"no_notifs": "Du hast keine neuen Benachrichtigungen",
"see_all": "Alle Benachrichtigungen ansehen",
"back_to_home": "Zurück zur Startseite",
"outgoing_link": "Externer Link",
"outgoing_link_message": "Du verlässt nun",

@ -1,6 +1,7 @@
{
"home": "Home",
"unread": "Unread Topics",
"popular": "Popular Topics",
"recent": "Recent Topics",
"users": "Registered Users",
"notifications": "Notifications",

@ -3,5 +3,5 @@
"day": "Tag",
"week": "Woche",
"month": "Monat",
"no_recent_topics": "There are no recent topics."
"no_recent_topics": "Es gibt keine aktuellen Themen."
}

@ -2,7 +2,7 @@
"topic": "Thema",
"topics": "Themen",
"no_topics_found": "Keine passende Themen gefunden.",
"no_posts_found": "No posts found!",
"no_posts_found": "Keine Beiträge gefunden!",
"profile": "Profil",
"posted_by": "Geposted von",
"chat": "Chat",
@ -19,19 +19,19 @@
"tools": "Tools",
"flag": "Markieren",
"flag_title": "Diesen Beitrag zur Moderation markieren",
"deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
"watch": "Watch",
"share_this_post": "Share this Post",
"deleted_message": "Dieser Thread wurde gelöscht. Nur Nutzer mit Thread-Management Rechten können ihn sehen.",
"watch": "Beobachten",
"share_this_post": "Diesen Beitrag teilen",
"thread_tools.title": "Thread Tools",
"thread_tools.markAsUnreadForAll": "Als ungelesen markieren",
"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": "Thema anpinnen",
"thread_tools.unpin": "Thema nicht mehr anpinnen",
"thread_tools.lock": "Thema schließen",
"thread_tools.unlock": "Thema öffnen",
"thread_tools.move": "Thema verschieben",
"thread_tools.fork": "Thema aufspalten",
"thread_tools.delete": "Thema löschen",
"thread_tools.restore": "Thema wiederherstellen",
"load_categories": "Kategorien laden",
"disabled_categories_note": "Deaktivierte Kategorien sind ausgegraut.",
"confirm_move": "verschieben",
@ -41,10 +41,10 @@
"favourites.not_logged_in.title": "Nicht eingeloggt!",
"favourites.not_logged_in.message": "Bitte logge dich ein, um diesen Beitrag favorisieren zu können.",
"favourites.has_no_favourites": "Du hast noch keine Favoriten.",
"vote.not_logged_in.title": "Not Logged In",
"vote.not_logged_in.message": "Please log in in order to vote",
"vote.cant_vote_self.title": "Invalid Vote",
"vote.cant_vote_self.message": "You cannot vote for your own post",
"vote.not_logged_in.title": "Nicht eingeloggt",
"vote.not_logged_in.message": "Zum Bewerten bitte einloggen",
"vote.cant_vote_self.title": "Ungültige Bewertung",
"vote.cant_vote_self.message": "Du kannst deinen eigenen Beitrag nicht bewerten",
"loading_more_posts": "Lade Mehr Posts",
"move_topic": "Thema verschieben",
"move_post": "Beitrag verschieben",
@ -55,11 +55,11 @@
"fork_success": "Thema erfolgreich aufgespalten!",
"reputation": "Reputation",
"posts": "Beiträge",
"composer.title_placeholder": "Enter your topic title here...",
"composer.write": "Write",
"composer.preview": "Preview",
"composer.discard": "Discard",
"composer.submit": "Submit",
"composer.replying_to": "Replying to",
"composer.new_topic": "New Topic"
"composer.title_placeholder": "Hier den Titel des Themas eingeben...",
"composer.write": "Schreiben",
"composer.preview": "Vorschau",
"composer.discard": "Verwerfen",
"composer.submit": "Absenden",
"composer.replying_to": "Als Antwort auf",
"composer.new_topic": "Neues Thema"
}

@ -9,7 +9,7 @@
"age": "Alter",
"joined": "Beigetreten",
"lastonline": "Zuletzt online",
"profile": "Profile",
"profile": "Profil",
"profile_views": "Profilaufrufe",
"reputation": "Reputation",
"posts": "Posts",
@ -20,28 +20,28 @@
"gravatar": "Gravatar",
"birthday": "Geburtstag",
"chat": "Chat",
"follow": "Follow",
"unfollow": "Unfollow",
"follow": "Folgen",
"unfollow": "Nicht mehr folgen",
"change_picture": "Ändere Profilbild",
"edit": "Ändern",
"uploaded_picture": "Hochgeladene Bilder",
"upload_new_picture": "Neues Bild hochladen",
"current_password": "Current Password",
"current_password": "Aktuelles Passwort",
"change_password": "Ändere Passwort",
"confirm_password": "Passwort wiederholen",
"password": "Passwort",
"upload_picture": "Bild hochladen",
"upload_a_picture": "Ein Bild hochladen",
"image_spec": "You may only upload PNG, JPG, or GIF files",
"image_spec": "Du darfst nur Dateien vom Typ PNG, JPG oder GIF hochladen",
"max": "max.",
"settings": "Einstellungen",
"show_email": "Zeige meine E-Mail Adresse an.",
"has_no_follower": "Dieser User hat noch keine Follower.",
"follows_no_one": "Dieser User folgt noch niemanden.",
"has_no_posts": "This user didn't post anything yet.",
"has_no_posts": "Dieser Nutzer hat noch nichts gepostet.",
"email_hidden": "E-Mail Adresse versteckt",
"hidden": "versteckt",
"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": "Themen und Beiträge auf Seiten aufteilen statt unendliches Scrollen verweden",
"topics_per_page": "Themen pro Seite",
"posts_per_page": "Beiträge pro Seite"
}

@ -1,6 +1,7 @@
{
"home": "Home",
"unread": "Unread Topics",
"popular": "Popular Topics",
"recent": "Recent Topics",
"users": "Registered Users",
"notifications": "Notifications",

@ -1,6 +1,7 @@
{
"home": "Home",
"unread": "Unread Topics",
"popular": "Popular Topics",
"recent": "Recent Topics",
"users": "Registered Users",
"notifications": "Notifications",

@ -1,6 +1,7 @@
{
"home": "Home",
"unread": "Unread Topics",
"popular": "Popular Topics",
"recent": "Recent Topics",
"users": "Registered Users",
"notifications": "Notifications",

@ -1,6 +1,7 @@
{
"home": "Accueil",
"unread": "Sujets non lus",
"popular": "Popular Topics",
"recent": "Sujets Récents",
"users": "Utilisateurs enregistrés",
"notifications": "Notifications",

@ -1,6 +1,7 @@
{
"home": "דף הבית",
"unread": "נושאים שלא נקראו",
"popular": "Popular Topics",
"recent": "נושאים אחרונים",
"users": "משתמשים רשומים",
"notifications": "התראות",

@ -1,6 +1,7 @@
{
"home": "Kezdőlap",
"unread": "Olvasatlan Topikok",
"popular": "Popular Topics",
"recent": "Friss Topikok",
"users": "Regisztrált Felhasználók",
"notifications": "Értesítések",

@ -1,6 +1,7 @@
{
"home": "Home",
"unread": "Unread Topics",
"popular": "Popular Topics",
"recent": "Recent Topics",
"users": "Registered Users",
"notifications": "Notifications",

@ -1,6 +1,7 @@
{
"home": "Hjem",
"unread": "Uleste emner",
"popular": "Popular Topics",
"recent": "Seneste emner",
"users": "Registrerte brukere",
"notifications": "Varsler",

@ -10,14 +10,14 @@
"500.message": "Coś poszło nie tak.",
"register": "Zarejestruj się",
"login": "Zaloguj się",
"welcome_back": "Welcome Back ",
"you_have_successfully_logged_in": "You have successfully logged in",
"welcome_back": "Witaj z powrotem!",
"you_have_successfully_logged_in": "Zostałeś pomyślnie zalogowany.",
"logout": "Wyloguj się",
"logout.title": "Wylogowałeś się.",
"logout.message": "Pomyślnie wylogowałeś się z forum.",
"save_changes": "Zapisz zmiany",
"close": "Zamknij",
"pagination": "Pagination",
"pagination": "Numerowanie stron",
"header.admin": "Administracja",
"header.recent": "Ostatnie",
"header.unread": "Nieprzeczytane",
@ -52,5 +52,5 @@
"dnd": "Nie przeszkadzać",
"invisible": "Niewidoczny",
"offline": "Niedostępny",
"privacy": "Privacy"
"privacy": "Prywatność"
}

@ -1,6 +1,7 @@
{
"home": "Strona główna",
"unread": "Nieprzeczytane wątki",
"popular": "Popular Topics",
"recent": "Ostatnie wątki",
"users": "Zarejestrowani użytkownicy",
"notifications": "Powiadomienia",

@ -19,15 +19,15 @@
"tools": "Narzędzia",
"flag": "Zgłoś",
"flag_title": "Zgłoś post do moderacji",
"deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
"watch": "Watch",
"share_this_post": "Share this Post",
"deleted_message": "Ten wątek został usunięty. Tylko użytkownicy z uprawnieniami do zarządzania wątkami mogą go widzieć.",
"watch": "Obserwuj",
"share_this_post": "Udostępnij",
"thread_tools.title": "Narzędzia wątków",
"thread_tools.markAsUnreadForAll": "Oznacz jako nieprzeczytany",
"thread_tools.pin": "Przypnij wątek",
"thread_tools.unpin": "Unpin Topic",
"thread_tools.unpin": "Odepnij wątek",
"thread_tools.lock": "Zamknij wątek",
"thread_tools.unlock": "Unlock Topic",
"thread_tools.unlock": "Otwórz wątek",
"thread_tools.move": "Przenieś wątek",
"thread_tools.fork": "Skopiuj wątek",
"thread_tools.delete": "Usuń wątek",

@ -26,7 +26,7 @@
"edit": "Edytuj",
"uploaded_picture": "Przesłane zdjęcie",
"upload_new_picture": "Prześlij nowe zdjęcie",
"current_password": "Current Password",
"current_password": "Obecne hasło",
"change_password": "Zmień hasło",
"confirm_password": "Potwierdź hasło",
"password": "Hasło",

@ -1,6 +1,7 @@
{
"home": "Home",
"unread": "Tópicos Não Lidos",
"popular": "Popular Topics",
"recent": "Tópicos Recentes",
"users": "Usuários Registrados",
"notifications": "Notificações",

@ -1,7 +1,7 @@
{
"title": "Уведомления",
"no_notifs": "You have no new notifications",
"see_all": "See all Notifications",
"no_notifs": "Для Вас нет новых уведомлений",
"see_all": "Просмотреть все уведомления",
"back_to_home": "Вернуться на NodeBB",
"outgoing_link": "Внешняя ссылка",
"outgoing_link_message": "Вы покидаете",

@ -1,6 +1,7 @@
{
"home": "Главная",
"unread": "Непрочитанные темы",
"popular": "Popular Topics",
"recent": "Последние темы",
"users": "Зарегистрированные пользователи",
"notifications": "Уведомления",

@ -26,8 +26,8 @@
"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.lock": "Закрыть Тему",
"thread_tools.unlock": "Открыть Тему",
"thread_tools.move": "Move Topic",
"thread_tools.fork": "Fork Topic",
"thread_tools.delete": "Delete Topic",

@ -1,6 +1,7 @@
{
"home": "Home",
"unread": "Unread Topics",
"popular": "Popular Topics",
"recent": "Recent Topics",
"users": "Registered Users",
"notifications": "Notifications",

@ -1,6 +1,7 @@
{
"home": "Hem",
"unread": "Olästa ämnen",
"popular": "Popular Topics",
"recent": "Senaste ämnena",
"users": "Registrerade användare",
"notifications": "Notiser",

@ -1,6 +1,7 @@
{
"home": "Ana Sayfa",
"unread": "Okunmayan Başlıklar",
"popular": "Popular Topics",
"recent": "Güncel Konular",
"users": "Kayıtlı Kullanıcılar",
"notifications": "Bildirimler",

@ -10,7 +10,7 @@
"500.message": "不好!看来是哪里出错了!",
"register": "注册",
"login": "登录",
"welcome_back": "Welcome Back ",
"welcome_back": "欢迎回来",
"you_have_successfully_logged_in": "You have successfully logged in",
"logout": "退出",
"logout.title": "你已经退出。",

@ -6,5 +6,5 @@
"forgot_password": "忘记密码?",
"alternative_logins": "其他登录方式",
"failed_login_attempt": "登录失败,请再尝试。",
"login_successful": "你已成功登录!"
"login_successful": "您已经成功登录!"
}

@ -1,6 +1,7 @@
{
"home": "Home",
"unread": "Unread Topics",
"popular": "Popular Topics",
"recent": "Recent Topics",
"users": "Registered Users",
"notifications": "Notifications",

@ -1,47 +1,47 @@
{
"banned": "封禁",
"offline": "线",
"offline": "线",
"username": "用户名",
"email": "Email",
"email": "邮件",
"fullname": "姓名",
"website": "网站",
"location": "地址",
"age": "年龄",
"joined": "加入时间",
"lastonline": "最后在线",
"profile": "Profile",
"profile": "资料",
"profile_views": "资料被查看",
"reputation": "声望",
"posts": "发帖数",
"favourites": "Favourites",
"favourites": "收藏的帖子",
"followers": "被关注",
"following": "关注",
"signature": "签名",
"gravatar": "Gravatar头像",
"birthday": "生日",
"chat": "Chat",
"follow": "Follow",
"unfollow": "Unfollow",
"chat": "聊天",
"follow": "关注",
"unfollow": "取消关注",
"change_picture": "改变头像",
"edit": "编辑",
"uploaded_picture": "已有头像",
"upload_new_picture": "上传新头像",
"current_password": "Current Password",
"current_password": "当前密码",
"change_password": "更改密码",
"confirm_password": "确认密码",
"password": "密码",
"upload_picture": "上传头像",
"upload_a_picture": "上传一张照片",
"image_spec": "You may only upload PNG, JPG, or GIF files",
"max": "max.",
"settings": "Settings",
"image_spec": "您只能上传PNG,JPG或者是GIF图片文件",
"max": "最大.",
"settings": "设置",
"show_email": "显示我的邮箱",
"has_no_follower": "该用户还没有被任何人关注。",
"follows_no_one": "该用户还没有关注过任何人。",
"has_no_posts": "This user didn't post anything yet.",
"has_no_posts": "此用户还未发表过任何帖子.",
"email_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"
"paginate_description": "使用分页方式显示话题和帖子,代替滚动显示",
"topics_per_page": "每页话题数量设置",
"posts_per_page": "每页帖子数量设置"
}

@ -1,6 +1,7 @@
{
"home": "Home",
"unread": "Unread Topics",
"popular": "Popular Topics",
"recent": "Recent Topics",
"users": "Registered Users",
"notifications": "Notifications",

@ -14,7 +14,23 @@ define(function() {
}, function() {
window.location.href = RELATIVE_PATH + '/';
});
})
});
$.get('https://api.github.com/repos/designcreateplay/NodeBB/tags', function(releases) {
var version = $('#version').html(),
latestVersion = releases[0].name.slice(1),
checkEl = $('.version-check');
checkEl.html($('.version-check').html().replace('<i class="fa fa-spinner fa-spin"></i>', 'v' + latestVersion));
// Alter box colour accordingly
if (latestVersion === version) {
checkEl.removeClass('alert-info').addClass('alert-success');
checkEl.append('<p>You are <strong>up-to-date</strong> <i class="fa fa-check"></i></p>');
} else if (latestVersion > version) {
checkEl.removeClass('alert-info').addClass('alert-danger');
checkEl.append('<p>A new version (v' + latestVersion + ') has been released. Consider upgrading your NodeBB.</p>');
}
});
};
Admin.updateRoomUsage = function(err, data) {

@ -218,7 +218,12 @@ define(['taskbar'], function(taskbar) {
case 'fa fa-link':
if (selectionStart === selectionEnd) {
// Nothing selected
var cursorPos = postContentEl[0].selectionStart;
insertIntoInput(postContentEl, "[link text](link url)");
// Highlight "link url"
postContentEl[0].selectionStart = cursorPos + 12;
postContentEl[0].selectionEnd = cursorPos + 20;
} else {
// Text selected
postContentEl.val(postContentEl.val().slice(0, selectionStart) + '[' + postContentEl.val().slice(selectionStart, selectionEnd) + '](link url)' + postContentEl.val().slice(selectionEnd));

@ -1,20 +1,36 @@
<div class="jumbotron">
<h1>Welcome to NodeBB</h1>
<br />
<p>
<a target="_blank" href="http://community.nodebb.org" class="btn btn-default btn-lg"><i class="fa fa-comment"></i> NodeBB Community Forum</a>
<a target="_blank" href="http://community.nodebb.org/" class="btn btn-default btn-lg"><i class="fa fa-github-alt"></i> Get Plugins and Themes</a>
<a target="_blank" href="http://www.twitter.com/NodeBB" class="btn btn-default btn-lg"><i class="fa fa-twitter"></i> Follow @NodeBB</a>
<a target="_blank" href="https://github.com/designcreateplay/NodeBB/wiki" class="btn btn-default btn-lg"><i class="fa fa-question-circle"></i> NodeBB Wiki</a>
</p>
<p><small>You are running <strong>NodeBB v{version}</strong>. Always make sure that your <strong>NodeBB</strong> is up to date for the latest security patches and bug fixes.</small></p>
</div>
<div class="">
<h2>Active Users <small><span class="badge" id="connections"></span> socket connections</small></h2>
<p id="active_users">
</p>
</div>
<div class="home">
<div class="col-sm-6">
<div class="panel panel-default">
<div class="panel-heading">Welcome to NodeBB</div>
<div class="panel-body">
<p>
<a target="_blank" href="http://community.nodebb.org" class="btn btn-default btn-sm"><i class="fa fa-comment"></i> NodeBB Community Forum</a>
<a target="_blank" href="http://community.nodebb.org/" class="btn btn-default btn-sm"><i class="fa fa-github-alt"></i> Get Plugins and Themes</a>
<a target="_blank" href="http://www.twitter.com/NodeBB" class="btn btn-default btn-sm"><i class="fa fa-twitter"></i> Follow @NodeBB</a>
<a target="_blank" href="https://github.com/designcreateplay/NodeBB/wiki" class="btn btn-default btn-sm"><i class="fa fa-question-circle"></i> NodeBB Wiki</a>
</p>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="panel panel-default">
<div class="panel-heading">Active Users <small><span class="badge" id="connections"></span> socket connections</small></div>
<div class="panel-body">
<div id="active_users"></div>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="panel panel-default">
<div class="panel-heading">Updates</div>
<div class="panel-body">
<div class="alert alert-info version-check">
<p>You are running <strong>NodeBB v<span id="version">{version}</span></strong>.</p>
</div>
<p>
Always make sure that your <strong>NodeBB</strong> is up to date for the latest security patches and bug fixes.
</p>
</div>
</div>
</div>
</div>

@ -132,16 +132,6 @@ module.exports.server = server;
href: nconf.get('relative_path') + '/favicon.ico'
});
// Browser Title
var metaTitle = templateValues.metaTags.filter(function(tag) {
return tag.property === 'og:title';
});
if (metaTitle.length > 0 && metaTitle[0].content) {
templateValues.browserTitle = metaTitle[0].content;
} else {
templateValues.browserTitle = meta.config.browserTitle || 'NodeBB';
}
if(options.req.user && options.req.user.uid) {
uid = options.req.user.uid;
}
@ -153,15 +143,34 @@ module.exports.server = server;
templateValues.customCSS = meta.config.customCSS;
}
user.isAdministrator(uid, function(err, isAdmin) {
templateValues.isAdmin = isAdmin;
async.parallel([
function(next) {
translator.get('pages:' + path.basename(options.req.url), function(translated) {
var metaTitle = templateValues.metaTags.filter(function(tag) {
return tag.name === 'title';
});
if (translated) {
templateValues.browserTitle = translated;
} else if (metaTitle.length > 0 && metaTitle[0].content) {
templateValues.browserTitle = metaTitle[0].content;
} else {
templateValues.browserTitle = meta.config.browserTitle || 'NodeBB';
}
next();
});
},
function(next) {
user.isAdministrator(uid, function(err, isAdmin) {
templateValues.isAdmin = isAdmin || false;
next();
});
}
], function() {
translator.translate(templates.header.parse(templateValues), function(template) {
callback(null, template);
});
});
});
};

Loading…
Cancel
Save