diff --git a/public/language/de/category.json b/public/language/de/category.json new file mode 100644 index 0000000000..9f2bc440f4 --- /dev/null +++ b/public/language/de/category.json @@ -0,0 +1,14 @@ +{ + "new_topic_button": "Neues Thema", + "no_topics": "<strong>Es gibt noch keine Threads in dieser Kategorie.</strong><br />Warum beginnst du nicht den ersten?", + "sidebar.recent_replies": "Neuste Antworten", + "sidebar.active_participants": "Aktive Teilnehmer", + "sidebar.moderators": "Moderatoren", + "posts": "Posts", + "views": "Aufrufe", + "posted": "Geposted", + "browsing": "Sieht zu", + "no_one_has_replied": "Niemand hat geantwortet", + "replied": "geantwortet", + "last_edited_by": "zuletzt editiert durch" +} diff --git a/public/language/de/footer.json b/public/language/de/footer.json new file mode 100644 index 0000000000..adf674ca29 --- /dev/null +++ b/public/language/de/footer.json @@ -0,0 +1,10 @@ +{ + "chat.chatting_with": "Chatten mit <span id='chat-with-name'></span>", + "chat.placeholder": "schreibe hier etwas, und drücke Enter zum absenden", + "chat.send": "Senden", + "stats.online": "Online", + "stats.users": "Benutzer", + "stats.topics": "Themen", + "stats.posts": "Beiträge", + "success": "erfolg" +} diff --git a/public/language/de/global.json b/public/language/de/global.json new file mode 100644 index 0000000000..8f0dba7a18 --- /dev/null +++ b/public/language/de/global.json @@ -0,0 +1,30 @@ +{ + "home": "Übersicht", + "search": "Suche", + "buttons.close": "Schließen", + "403.title": "Zugriff Verweigert", + "403.message": "Du bist nicht dazu berechtigt, diese Seite aufzurufen. <a href='/login'>Logge dich ein</a> und versuche es erneut.", + "404.title": " Nicht Gefunden", + "404.message": "Die abgefragte Seite wurde nicht gefunden. <a href='/''>Zurück zur Übersicht</a>.", + "500.title": "Internal error.", + "500.message": "Ooops! Looks like something went wrong!", + + "register": "Registrierung", + "login": "Login", + + "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", + + "header.admin": "Admin", + "header.recent": "Aktuell", + "header.unread": "Ungelesen", + "header.users": "Benutzer", + "header.search": "Suche", + "header.profile": "Profil", + + "notifications.loading": "Benachrichtigungen laden" +} diff --git a/public/language/de/login.json b/public/language/de/login.json new file mode 100644 index 0000000000..eb7f071969 --- /dev/null +++ b/public/language/de/login.json @@ -0,0 +1,10 @@ +{ + "login": "Einloggen", + "username": "Benutzername", + "password": "Passwort", + "remember_me": "Eingeloggt bleiben?", + "forgot_password": "Passwort vergessen?", + "alternative_logins": "Login Alternativen", + "failed_login_attempt": " Anmeldeversuch fehlgeschlagen, versuche es erneut.", + "login_successful": "Du hast dich erfolgreich eingeloggt!" +} diff --git a/public/language/de/notifications.json b/public/language/de/notifications.json new file mode 100644 index 0000000000..7e5ac112e9 --- /dev/null +++ b/public/language/de/notifications.json @@ -0,0 +1,9 @@ +{ + "title": "Benachrichtigungen", + "back_to_home": "Zurück zur Startseite", + "mark_all_as_read": "Alles als gelesen markieren", + "outgoing_link": "Externer Link", + "outgoing_link_message": "Du verlässt nun", + "continue_to": "Gehe weiter zu", + "return_to": "Kehre zurück zu" +} diff --git a/public/language/de/recent.json b/public/language/de/recent.json new file mode 100644 index 0000000000..c6d5301470 --- /dev/null +++ b/public/language/de/recent.json @@ -0,0 +1,5 @@ +{ + "day": "Tag", + "week": "Woche", + "month": "Monat" +} diff --git a/public/language/de/register.json b/public/language/de/register.json new file mode 100644 index 0000000000..2c1469ed7a --- /dev/null +++ b/public/language/de/register.json @@ -0,0 +1,16 @@ +{ + "register": "Registrieren", + "help.email": "Deine E-Mail Adresse ist standardmäßig nicht öffentlich sichtbar.", + "help.username_restrictions": "Einen einmaligen Benutzernamen. 3-16 Zeichen. Andere Benutzer können dich mit @<span id='yourUsername'>Benutzername</span> anschreiben.", + "help.minimum_password_length": "Dein Passwort muss mindestens sechs Zeichen lang sein.", + "email_address": "E-Mail", + "email_address_placeholder": "E-Mail Adresse hier eingeben", + "username": "Benutzername", + "username_placeholder": "Benutzernamen eingeben", + "password": "Passwort", + "password_placeholder": "Passwort eingeben", + "confirm_password": "Passwort bestätigen", + "confirm_password_placeholder": "Passwort zur Bestätigung erneut eingeben", + "register_now_button": "Jetzt registrieren", + "alternative_registration": "Alternative Registrierung" +} diff --git a/public/language/de/reset_password.json b/public/language/de/reset_password.json new file mode 100644 index 0000000000..65eaca9028 --- /dev/null +++ b/public/language/de/reset_password.json @@ -0,0 +1,13 @@ +{ + "reset_password": "Passwort zurücksetzen", + "update_password": "Ändere Passwort", + "password_change": "Passwort wurde geändert", + "password_reset_successful": "<p>Das Passwort wurde erfolgreich zurückgesetzt. <a href=\"/login\">Log dich neu ein</a>.", + "wrong_reset_code.title": "Der Reset-Code ist falsch.", + "wrong_reset_code.message": "Der empfangene Reset-Code war falsch. Bitte versuche es erneut oder <a href=\"/reset\">fordere einen neuen Code an</a>.", + "new_password": "Neues Passwort", + "repeat_password": "Wiederhole das Passwort", + "enter_email": "Bitte gib Deine <strong>E-Mail Adresse</strong> ein und wir senden Dir eine Anleitung, wie Du Dein Passwort zurücksetzen kannst.", + "password_reset_sent": "Passwortzrücksetzung beantragt.", + "invalid_email": "Ungültige E-Mail / Adresse existiert nicht!" +} diff --git a/public/language/de/topic.json b/public/language/de/topic.json new file mode 100644 index 0000000000..c1c9c03f8c --- /dev/null +++ b/public/language/de/topic.json @@ -0,0 +1,40 @@ +{ + "topic": "Thema", + "topics": "Themen", + + "no_topics_found": "Keine passende Themen gefunden.", + + "profile": "Profil", + "posted_by": "geschrieben von", + "chat": "Chat", + "notify_me": "Werde bei neues Antworten auf dieses Thema benachrichtigt.", + "quote": "zitieren", + "reply": "antworten", + "edit": "bearbeiten", + "delete": "löschen", + "banned": "gesperrt", + "link": "Link", + + "thread_tools.title": "Thread Tools", + "thread_tools.pin": "Thread pinnen", + "thread_tools.unpin": "Thread nicht mehr pinnen", + "thread_tools.lock": "Thread sperren", + "thread_tools.move": "Thread verschieben", + "thread_tools.delete": "Thread löschen", + + "load_categories": "Kategorien laden", + "disabled_categories_note": "Deaktivierte Kategorien sind ausgegraut.", + "confirm_move": "verschieben", + + "favourite": "Favorit", + "favourites": "Favoriten", + "favourites.not_logged_in.title": "Nicht eingeloggt!", + "favourites.not_logged_in.message": "Bitte logge dich ein, um diesen Beitrag favorisieren zu können.", + "favourites.haz_no_favourites":"Du hast noch keine Favoriten.", + + "posted_by": "Geposted von", + "loading": "Lade", + "more_posts": "Mehr Posts", + "move_topic": "Thema verschieben", + "topic_will_be_moved_to": "Dieses Thema wird verschoben nach" +} diff --git a/public/language/de/unread.json b/public/language/de/unread.json new file mode 100644 index 0000000000..28585b0aa0 --- /dev/null +++ b/public/language/de/unread.json @@ -0,0 +1,5 @@ +{ + "no_unread_topics": "Es gibt keine ungelesenen Themen.", + "mark_all_read": "alle als gelesen markieren", + "load_more": "mehr laden" +} \ No newline at end of file diff --git a/public/language/de/user.json b/public/language/de/user.json new file mode 100644 index 0000000000..cbe455f8d3 --- /dev/null +++ b/public/language/de/user.json @@ -0,0 +1,38 @@ +{ + "banned": "Gebannt", + "offline": "offline", + "email": "E-Mail", + "fullname": "Kompletter Name", + "website": "Homepage", + "location": "Wohnort", + "age": "Alter", + "joined": "Beigetreten", + "profil_views": "Profilaufrufe", + "reputation": "Reputation", + "posts": "Posts", + "followers": "Follower", + "following": "Folgt", + "signature": "Signatur", + "gravatar": "Gravatar", + "birthday": "Geburtstag", + + "change_picture": "Ändere Profilbild", + "edit": "Ändern", + "uploaded_pictures": "Hochgeladene Bilder", + "upload_new_picture": "Neues Bild hochladen", + "change_password": "Ändere Passwort", + "confirm_password": "Passwort wiederholen", + "password": "Passwort", + + "upload_picture": "Bild hochladen", + "upload_a_picture": "Ein Bild hochladen", + "image_spec": "Du solltest nur Dateien die PNG, JPG, oder GIF kleiner als 256kb hochladen.", + + "settings": "Einstellungen", + "show_my_email": "Zeige meine E-Mail Adresse an.", + + "haz_no_follower": "Dieser User hat noch keine Follower.", + "follows_no_one": "Dieser User folgt noch niemanden." + + +} diff --git a/public/language/de/users.json b/public/language/de/users.json new file mode 100644 index 0000000000..32ca305187 --- /dev/null +++ b/public/language/de/users.json @@ -0,0 +1,9 @@ +{ + "latest_users": "neuste Benutzer", + "top_posters": "meiste Beiträge", + "most_reputation": "höhstes Ansehen", + "online": "Online", + "search": "Suchen", + "enter_username": "Benutzer durchsuchen", + "load_more": "mehr laden" +} diff --git a/public/language/en/category.json b/public/language/en/category.json index 73d3bef853..189f513e63 100644 --- a/public/language/en/category.json +++ b/public/language/en/category.json @@ -3,5 +3,12 @@ "no_topics": "<strong>There are no topics in this category.</strong><br />Why don't you try posting one?", "sidebar.recent_replies": "Recent Replies", "sidebar.active_participants": "Active Participants", - "sidebar.moderators": "Moderators" -} \ No newline at end of file + "sidebar.moderators": "Moderators", + "posts": "Posts", + "views": "Aufrufe", + "posted": "Geposted", + "browsing": "browsing", + "no_one_has_replied": "Niemand hat geantwortet", + "replied": "geantwortet", + "last_edited_by": "last edited by" +} diff --git a/public/language/en/footer.json b/public/language/en/footer.json index 32d2e92bbe..77cf98c039 100644 --- a/public/language/en/footer.json +++ b/public/language/en/footer.json @@ -5,5 +5,6 @@ "stats.online": "Online", "stats.users": "Users", "stats.topics": "Topics", - "stats.posts": "Posts" -} \ No newline at end of file + "stats.posts": "Posts", + "success": "success" +} diff --git a/public/language/en/global.json b/public/language/en/global.json index 32ea294957..b8a140d0e6 100644 --- a/public/language/en/global.json +++ b/public/language/en/global.json @@ -8,14 +8,24 @@ "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": "Ooops! Looks like something went wrong!", + + "register": "register", + "login": "Login", + "logout": "Logout", "logout.title": "You are now logged out.", "logout.message": "You have successfully logged out of NodeBB", + + "save_changes": "save changes", + "close": "close", + "header.admin": "Admin", "header.recent": "Recent", "header.unread": "Unread", "header.users": "Users", "header.search": "Search", + "header.profile": "Profile", + "notifications.loading": "Loading Notifications", "chats.loading": "Loading Chats" -} \ No newline at end of file +} diff --git a/public/language/en/login.json b/public/language/en/login.json index 947395a46d..f2090276a1 100644 --- a/public/language/en/login.json +++ b/public/language/en/login.json @@ -7,4 +7,4 @@ "alternative_logins": "Alternative Logins", "failed_login_attempt": "Failed login attempt, please try again.", "login_successful": "You have successfully logged in!" -} \ No newline at end of file +} diff --git a/public/language/en/notifications.json b/public/language/en/notifications.json index 212cf3fa4f..bfe2a48ab8 100644 --- a/public/language/en/notifications.json +++ b/public/language/en/notifications.json @@ -1,3 +1,9 @@ { - "title": "Notifications" -} \ No newline at end of file + "title": "Notifications", + "back_to_home": "back to NodeBB", + "mark_all_as_read": "Mark All as Read", + "outgoing_link": "Outgoing Link", + "outgoing_link_message": "You are now leaving", + "continue_to": "Continue to", + "return_to": "Return to " +} diff --git a/public/language/en/reset_password.json b/public/language/en/reset_password.json new file mode 100644 index 0000000000..468bfb0254 --- /dev/null +++ b/public/language/en/reset_password.json @@ -0,0 +1,13 @@ +{ + "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.", + "password_reset_sent": "Password Reset Sent", + "invalid_email": "Invalid Email / Email does not exist!" +} diff --git a/public/language/en/topic.json b/public/language/en/topic.json index 278ceea37a..0d367fba46 100644 --- a/public/language/en/topic.json +++ b/public/language/en/topic.json @@ -1,23 +1,39 @@ { + "topic": "Topic", + "topics": "Topics", + + "no_topics_found": "No topics found!", + "profile": "Profile", "posted_by": "Posted by", "chat": "Chat", "notify_me": "Be notified of new replies in this topic", - "favourite": "Favourite", "quote": "Quote", "reply": "Reply", "edit": "Edit", "delete": "Delete", "banned": "banned", "link": "Link", + "thread_tools.title": "Thread Tools", "thread_tools.pin": "Pin Thread", "thread_tools.lock": "Lock Thread", "thread_tools.move": "Move Thread", "thread_tools.delete": "Delete Thread", + "load_categories": "Loading Categories", "disabled_categories_note": "Disabled Categories are greyed out", "confirm_move": "Move", + + "favourite": "Favourite", + "favourites": "Favorites", "favourites.not_logged_in.title": "Not Logged In", - "favourites.not_logged_in.message": "Please log in in order to favourite this post" -} \ No newline at end of file + "favourites.not_logged_in.message": "Please log in in order to favourite this post", + "favourites.haz_no_favourites": "You don't have any favourites, favourite some posts to see them here!", + + "posted_by": "posted by", + "loading": "Lade", + "more_posts": "More Posts", + "move_topic": "Move Topic", + "topic_will_be_moved_to": "This topic will be moved to the category" +} diff --git a/public/language/en/user.json b/public/language/en/user.json new file mode 100644 index 0000000000..8bc65b939b --- /dev/null +++ b/public/language/en/user.json @@ -0,0 +1,36 @@ +{ + "banned": "Banned", + "offline": "offline", + "email": "email", + "fullname": "full name", + "website": "website", + "location": "location", + "age": "age", + "joined": "joined", + "profil_views": "profil views", + "reputation": "reputation", + "posts": "posts", + "followers": "followers", + "following": "following", + "signature": "signature", + "gravatar": "gravatar", + "birthday": "birthday", + + "change_picture": "change picture", + "edit": "edit", + "uploaded_pictures": "uploaded pictures", + "upload_new_picture": "upload new picture", + "change_password": "change password", + "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 under 256kb.", + + "settings": "settings", + "show_my_email": "show my email", + + "haz_no_follower": "This user doesn't have any followers :(", + "follows_no_one": "This user isn't following anyone :(" +} diff --git a/public/templates/account.tpl b/public/templates/account.tpl index eb14891b85..da0014b0fe 100644 --- a/public/templates/account.tpl +++ b/public/templates/account.tpl @@ -13,71 +13,68 @@ <img src="{picture}" class="user-profile-picture img-thumbnail"/> </div> <div class="account-online-status"> - <span><i class="fa fa-circle-o"></i> <span>offline</span></span> + <span><i class="fa fa-circle-o"></i> <span>[[user:offline]]</span></span> </div> <!-- IF banned --> <div> - <span class="label label-danger">banned</span> + <span class="label label-danger">[[user:banned]]</span> </div> <!-- ENDIF banned --> - <div> - <a id="chat-btn" href="#" class="btn btn-default hide">Chat</a> - </div> <div id="user-actions"> - <a id="follow-btn" href="#" class="btn btn-default hide">Follow</a> - <a id="unfollow-btn" href="#" class="btn btn-default hide">Unfollow</a> + <a id="follow-btn" href="#" class="btn btn-default">Follow</a> + <a id="unfollow-btn" href="#" class="btn btn-default">Unfollow</a> </div> </div> <div class="col-md-4"> <div class="inline-block"> <div class="account-bio-block"> - <span class="account-bio-label">email</span><i class="fa fa-eye-slash {emailClass}" title="Email hidden"></i> + <span class="account-bio-label">[[user:email]]</span><i class="fa fa-eye-slash {emailClass}" title="Email hidden"></i> <span>{email}</span> <br/> - <span class="account-bio-label">full name</span> + <span class="account-bio-label">[[user:fullname]]</span> <span>{fullname}</span> <br/> - <span class="account-bio-label">website</span> + <span class="account-bio-label">[[user:website]]</span> <span><a href="{website}">{websiteName}</a></span> <br/> - <span class="account-bio-label">location</span> + <span class="account-bio-label">[[user:location]]</span> <span>{location}</span> <br/> - <span class="account-bio-label">age</span> + <span class="account-bio-label">[[user:age]]</span> <span>{age}</span> <br/> <hr/> - <span class="account-bio-label">joined</span> + <span class="account-bio-label">[[user:joined]]</span> <span class="timeago" title="{joindate}"></span> <br/> - <span class="account-bio-label">profile views</span> + <span class="account-bio-label">[[user:profil_views]]</span> <span class="formatted-number">{profileviews}</span> <br/> - <span class="account-bio-label">reputation</span> + <span class="account-bio-label">[[user:reputation]]</span> <span class="formatted-number">{reputation}</span> <br/> - <span class="account-bio-label">posts</span> + <span class="account-bio-label">[[user:posts]]</span> <span class="formatted-number">{postcount}</span> <br/> - <span class="account-bio-label">followers</span> + <span class="account-bio-label">[[user:followers]]</span> <span class="formatted-number">{followerCount}</span> <br/> - <span class="account-bio-label">following</span> + <span class="account-bio-label">[[user:following]]</span> <span class="formatted-number">{followingCount}</span> <br/> <hr/> - <span class="account-bio-label">signature</span> + <span class="account-bio-label">[[user:signature]]</span> <div class="post-signature"> <span id='signature'>{signature}</span> </div> @@ -102,4 +99,4 @@ <input type="hidden" template-variable="yourid" value="{yourid}" /> <input type="hidden" template-variable="theirid" value="{theirid}" /> -<input type="hidden" template-type="boolean" template-variable="isFollowing" value="{isFollowing}" /> \ No newline at end of file +<input type="hidden" template-type="boolean" template-variable="isFollowing" value="{isFollowing}" /> diff --git a/public/templates/accountedit.tpl b/public/templates/accountedit.tpl index c6594343db..e3c2803ce5 100644 --- a/public/templates/accountedit.tpl +++ b/public/templates/accountedit.tpl @@ -1,27 +1,27 @@ <div class="well"> - <div id="change-picture-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="Change Picture" aria-hidden="true"> + <div id="change-picture-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="[[user:change_picture]]" aria-hidden="true"> <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> - <h3 id="myModalLabel">Change Picture</h3> + <h3 id="myModalLabel">[[user:change_picture]]</h3> </div> <div class="modal-body"> <div id="gravatar-box"> <img id="user-gravatar-picture" src="" class="img-thumbnail user-profile-picture"> - <span class="user-picture-label">Gravatar</span> + <span class="user-picture-label">[[user: gravatar]]</span> <i class='fa fa-check fa-2x'></i> </div> <br/> <div id="uploaded-box"> <img id="user-uploaded-picture" src="" class="img-thumbnail user-profile-picture"> - <span class="user-picture-label">Uploaded picture</span> + <span class="user-picture-label">[[user: uploaded_picture]]</span> <i class='fa fa-check fa-2x'></i> </div> - <a id="uploadPictureBtn" href="#">Upload new picture</a> + <a id="uploadPictureBtn" href="#">[[user: upload_new_picture]]</a> </div> <div class="modal-footer"> <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button> @@ -34,7 +34,7 @@ <div class="account-username-box" data-userslug="{userslug}"> <span class="account-username"> <a href="/user/{userslug}">{username}</a> <i class="fa fa-chevron-right"></i> - <a href="/user/{userslug}/edit">edit</a> + <a href="/user/{userslug}/edit">[[user:edit]]</a> </span> </div> @@ -42,7 +42,7 @@ <div class="col-md-2" style="text-align: center; margin-bottom:20px;"> <div class="account-picture-block text-center"> <img id="user-current-picture" class="user-profile-picture img-thumbnail" src="{picture}" /><br /><br /> - <a id="changePictureBtn" href="#" class="btn btn-primary">change picture</a> + <a id="changePictureBtn" href="#" class="btn btn-primary">[[user:change_picture]]</a> </div> </div> @@ -50,42 +50,42 @@ <div> <form class='form-horizontal'> <div class="control-group"> - <label class="control-label" for="inputEmail">Email</label> + <label class="control-label" for="inputEmail">[[user:email]]</label> <div class="controls"> <input class="form-control" type="text" id="inputEmail" placeholder="Email" value="{email}"> </div> </div> <div class="control-group"> - <label class="control-label" for="inputFullname">Full Name</label> + <label class="control-label" for="inputFullname">[[user:fullname]]</label> <div class="controls"> <input class="form-control" type="text" id="inputFullname" placeholder="Full Name" value="{fullname}"> </div> </div> <div class="control-group"> - <label class="control-label" for="inputWebsite">Website</label> + <label class="control-label" for="inputWebsite">[[user:website]]</label> <div class="controls"> <input class="form-control" type="text" id="inputWebsite" placeholder="http://website.com" value="{website}"> </div> </div> <div class="control-group"> - <label class="control-label" for="inputLocation">Location</label> + <label class="control-label" for="inputLocation">[[user:location]]</label> <div class="controls"> <input class="form-control" type="text" id="inputLocation" placeholder="Location" value="{location}"> </div> </div> <div class="control-group"> - <label class="control-label" for="inputBirthday">Birthday</label> + <label class="control-label" for="inputBirthday">[[user:birthday]]</label> <div class="controls"> <input class="form-control" type="date" id="inputBirthday" placeholder="mm/dd/yyyy" value="{birthday}"> </div> </div> <div class="control-group"> - <label class="control-label" for="inputSignature">Signature</label> + <label class="control-label" for="inputSignature">[[user:signature]]</label> <div class="controls"> <textarea class="form-control" id="inputSignature" placeholder="max 150 chars" rows="5">{signature}</textarea> </div> @@ -94,7 +94,7 @@ <input type="hidden" id="inputUID" value="{uid}"><br /> <div class="form-actions"> - <a id="submitBtn" href="#" class="btn btn-primary">Save changes</a> + <a id="submitBtn" href="#" class="btn btn-primary">[[global:save_changes]]</a> </div> </form> @@ -114,7 +114,7 @@ </div> <div class="control-group"> - <label class="control-label" for="inputNewPassword">Password</label> + <label class="control-label" for="inputNewPassword">[[user:password]]</label> <div class="input-group"> <input class="form-control" type="password" id="inputNewPassword" placeholder="New Password" value=""> <span class="input-group-addon"> @@ -124,7 +124,7 @@ </div> <div class="control-group"> - <label class="control-label" for="inputNewPasswordAgain">Confirm Password</label> + <label class="control-label" for="inputNewPasswordAgain">[[user:confirm_password]]</label> <div class="input-group"> <input class="form-control" type="password" id="inputNewPasswordAgain" placeholder="Confirm Password" value=""> <span class="input-group-addon"> @@ -134,7 +134,7 @@ </div> <br/> <div class="form-actions"> - <a id="changePasswordBtn" href="#" class="btn btn-primary">Change Password</a> + <a id="changePasswordBtn" href="#" class="btn btn-primary">[[user:change_password]]</a> </div> </form> diff --git a/public/templates/accountsettings.tpl b/public/templates/accountsettings.tpl index 73b0a44584..100073ef62 100644 --- a/public/templates/accountsettings.tpl +++ b/public/templates/accountsettings.tpl @@ -4,7 +4,7 @@ <div class="account-username-box" data-userslug="{userslug}"> <span class="account-username"> <a href="/user/{userslug}">{username}</a> <i class="fa fa-chevron-right"></i> - <a href="/user/{userslug}/settings">settings</a> + <a href="/user/{userslug}/settings">[[user:settings]]</a> </span> </div> @@ -13,7 +13,7 @@ <h4>privacy</h4> <div class="checkbox"> <label> - <input id="showemailCheckBox" type="checkbox" {showemail}> Show my email + <input id="showemailCheckBox" type="checkbox" {showemail}> [[user:show_my_email]] </label> </div> </div> @@ -23,6 +23,6 @@ </div> </div> <div class="form-actions"> - <a id="submitBtn" href="#" class="btn btn-primary">Save changes</a> + <a id="submitBtn" href="#" class="btn btn-primary">[[global:save_changes]]</a> </div> </div> diff --git a/public/templates/category.tpl b/public/templates/category.tpl index 5c5ebeb1b5..530524b22d 100644 --- a/public/templates/category.tpl +++ b/public/templates/category.tpl @@ -45,12 +45,12 @@ </a> <small> <span class="topic-stats"> - posts + [[category:posts]] <strong class="human-readable-number" title="{topics.postcount}">{topics.postcount}</strong> </span> | <span class="topic-stats"> - views + [[category:views]] <strong class="human-readable-number" title="{topics.viewcount}">{topics.viewcount}</strong> </span> | @@ -58,18 +58,18 @@ <a href="/user/{topics.userslug}"> <img class="teaser-pic" src="{topics.picture}" title="{topics.username}"/> </a> - posted <span class="timeago" title="{topics.relativeTime}"></span> + [[category:posted]] <span class="timeago" title="{topics.relativeTime}"></span> </span> <span class="pull-right hidden-xs"> <!-- IF topics.unreplied --> - No one has replied + [[category:no_one_has_replied]] <!-- ELSE --> <a href="/user/{topics.teaser_userslug}"> <img class="teaser-pic" src="{topics.teaser_userpicture}" title="{topics.teaser_username}"/> </a> <a href="../../topic/{topics.slug}#{topics.teaser_pid}"> - replied + [[category:replied]] </a> <span class="timeago" title="{topics.teaser_timestamp}"></span> <!-- ENDIF topics.unreplied --> @@ -120,4 +120,4 @@ <input type="hidden" template-variable="category_id" value="{category_id}" /> <input type="hidden" template-variable="twitter-intent-url" value="{twitter-intent-url}" /> <input type="hidden" template-variable="facebook-share-url" value="{facebook-share-url}" /> -<input type="hidden" template-variable="google-share-url" value="{google-share-url}" /> \ No newline at end of file +<input type="hidden" template-variable="google-share-url" value="{google-share-url}" /> diff --git a/public/templates/confirm.tpl b/public/templates/confirm.tpl index 41f6363398..255c59c005 100644 --- a/public/templates/confirm.tpl +++ b/public/templates/confirm.tpl @@ -2,6 +2,6 @@ <strong>{title}</strong> <p>{text}</p> <p> - <a href="/">NodeBB Home</a> + <a href="/">[[notification:back_to_home]]</a> </p> </div> diff --git a/public/templates/favourites.tpl b/public/templates/favourites.tpl index cfc11a5252..4640ae3782 100644 --- a/public/templates/favourites.tpl +++ b/public/templates/favourites.tpl @@ -2,19 +2,19 @@ <div class="account-username-box" data-userslug="{userslug}"> <span class="account-username"> <a href="/user/{userslug}">{username}</a> <i class="fa fa-chevron-right"></i> - <a href="/user/{userslug}/favourites">favourites</a> + <a href="/user/{userslug}/favourites">[[topic:favourites]]</a> </span> </div> <!-- IF show_nofavourites --> - <div id="no-favourites-notice" class="alert alert-warning">You don't have any favourites, favourite some posts to see them here!</div> + <div id="no-favourites-notice" class="alert alert-warning">[[topic:haz_no_favourites]]</div> <!-- ENDIF show_nofavourites --> <div class="row"> <div class="col-md-12 user-favourite-posts"> <!-- BEGIN posts --> <div class="topic-row img-thumbnail clearfix"> - <a href="../../user/{posts.userslug}"> + <a href="/user/baris"> <img title="{posts.username}" class="img-rounded user-img" src="{posts.picture}"> </a> diff --git a/public/templates/followers.tpl b/public/templates/followers.tpl index bc46415843..acb2f7c835 100644 --- a/public/templates/followers.tpl +++ b/public/templates/followers.tpl @@ -4,7 +4,7 @@ <div class="account-username-box" data-userslug="{userslug}"> <span class="account-username"> <a href="/user/{userslug}">{username}</a> <i class="fa fa-chevron-right"></i> - <a href="/user/{userslug}/followers">followers</a> + <a href="/user/{userslug}/followers">[[user:followers]]</a> </span> </div> @@ -30,7 +30,7 @@ </div> <!-- END followers --> </div> - <div id="no-followers-notice" class="alert alert-warning hide">This user doesn't have any followers :(</div> + <div id="no-followers-notice" class="alert alert-warning hide">[[user:haz_no_follower]]</div> </div> <input type="hidden" template-variable="yourid" value="{yourid}" /> diff --git a/public/templates/following.tpl b/public/templates/following.tpl index 62e361caad..4578a1b20f 100644 --- a/public/templates/following.tpl +++ b/public/templates/following.tpl @@ -4,7 +4,7 @@ <div class="account-username-box" data-userslug="{userslug}"> <span class="account-username"> <a href="/user/{userslug}">{username}</a> <i class="fa fa-chevron-right"></i> - <a href="/user/{userslug}/following">following</a> + <a href="/user/{userslug}/following">[[user:following]]</a> </span> </div> @@ -31,7 +31,7 @@ <!-- END following --> </div> - <div id="no-following-notice" class="alert alert-warning hide">This user isn't following anyone :(</div> + <div id="no-following-notice" class="alert alert-warning hide">[[user:follows_no_one]]</div> </div> <input type="hidden" template-variable="yourid" value="{yourid}" /> diff --git a/public/templates/footer.tpl b/public/templates/footer.tpl index de5c022e5b..75aba97dee 100644 --- a/public/templates/footer.tpl +++ b/public/templates/footer.tpl @@ -26,21 +26,21 @@ <div class="modal-content"> <div class="modal-header"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> - <h3 id="myModalLabel">Upload Picture</h3> + <h3 id="myModalLabel">[[user:upload_picture]]</h3> </div> <div class="modal-body"> <form id="uploadForm" action="" method="post" enctype="multipart/form-data"> <div class="form-group"> - <label for="userPhoto">Upload a picture</label> + <label for="userPhoto">[[user:upload_a_picture]]</label> <input type="file" id="userPhotoInput" name="userPhoto"> - <p class="help-block">You may only upload PNG, JPG, or GIF files under 256kb.</p> + <p class="help-block">[[user:image_spec]]</p> </div> <input id="imageUploadCsrf" type="hidden" name="_csrf" value="" /> </form> <div id="upload-progress-box" class="progress progress-striped"> <div id="upload-progress-bar" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="0" aria-valuemin="0"> - <span class="sr-only"> success</span> + <span class="sr-only"> [[footer:success]]</span> </div> </div> @@ -50,7 +50,7 @@ </div> <div class="modal-footer"> <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button> - <button id="pictureUploadSubmitBtn" class="btn btn-primary">Upload Picture</button> + <button id="pictureUploadSubmitBtn" class="btn btn-primary">[[user:upload_picture]]</button> </div> </div><!-- /.modal-content --> </div><!-- /.modal-dialog --> @@ -61,7 +61,7 @@ <footer id="footer" class="container footer"> {footerHTML} - <div class="copyright">Copyright © 2013 <a target="_blank" href="http://www.nodebb.org">NodeBB</a> by <a target="_blank" href="https://github.com/psychobunny">psychobunny</a>, <a href="https://github.com/julianlam" target="_blank">julianlam</a>, <a href="https://github.com/barisusakli" target="_blank">barisusakli</a> from <a target="_blank" href="http://www.designcreateplay.com">designcreateplay</a></div> + <div class="copyright">Powered by <a target="_blank" href="http://www.nodebb.org">NodeBB</a></div> </footer> <script> @@ -69,4 +69,4 @@ </script> </body> -</html> \ No newline at end of file +</html> diff --git a/public/templates/header.tpl b/public/templates/header.tpl index b1a2b48479..f08ff9680f 100644 --- a/public/templates/header.tpl +++ b/public/templates/header.tpl @@ -113,10 +113,10 @@ </a> <ul id="user-control-list" class="dropdown-menu" aria-labelledby="user_dropdown"> <li> - <a id="user-profile-link" href=""><span>Profile</span></a> + <a id="user-profile-link" href=""><span>[[global:header.profile]]</span></a> </li> <li id="logout-link"> - <a href="#">Log out</a> + <a href="#">[[global:logout]]</a> </li> </ul> </li> @@ -125,19 +125,19 @@ <ul id="logged-out-menu" class="nav navbar-nav navbar-right"> <li class="visible-lg visible-md visible-sm"> - <a href="/register">Register</a> + <a href="/register">[[global:register]]</a> </li> <li class="visible-lg visible-md visible-sm"> - <a href="/login">Login</a> + <a href="/login">[[global:login]]</a> </li> <li class="visible-xs"> <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="loggedout_dropdown"><i class="fa fa-sign-in"></i></a> <ul class="dropdown-menu" aria-labelledby="loggedout_dropdown"> <li> - <a href="/register">Register</a> + <a href="/register">[[global:register]]</a> </li> <li> - <a href="/login">Login</a> + <a href="/login">[[global:login]]</a> </li> </ul> </li> diff --git a/public/templates/login.tpl b/public/templates/login.tpl index a37adcdfd6..cad99bc5a4 100644 --- a/public/templates/login.tpl +++ b/public/templates/login.tpl @@ -20,13 +20,13 @@ <div class="form-group"> <label for="username" class="col-lg-2 control-label">[[login:username]]</label> <div class="col-lg-10"> - <input class="form-control" type="text" placeholder="Enter Username" name="username" id="username" /> + <input class="form-control" type="text" placeholder="[[login:username]]" name="username" id="username" /> </div> </div> <div class="form-group"> <label for="password" class="col-lg-2 control-label">[[login:password]]</label> <div class="col-lg-10"> - <input class="form-control" type="password" placeholder="Enter Password" name="password" id="password" /> + <input class="form-control" type="password" placeholder="[[login:password]]" name="password" id="password" /> </div> </div> <div class="form-group"> diff --git a/public/templates/notifications.tpl b/public/templates/notifications.tpl index 0c610a42b2..21c93a5547 100644 --- a/public/templates/notifications.tpl +++ b/public/templates/notifications.tpl @@ -1,6 +1,6 @@ <h2>[[notifications:title]]</h2> -<button type="button" class="btn btn-default" id="mark-all-notifs-read">Mark All as Read</button> +<button type="button" class="btn btn-default" id="mark-all-notifs-read">[[notifications:mark_all_as_read]]</button> <ul class="notifications-list"> <!-- BEGIN notifications --> @@ -11,4 +11,4 @@ </p> </li> <!-- END notifications --> -</ul> \ No newline at end of file +</ul> diff --git a/public/templates/outgoing.tpl b/public/templates/outgoing.tpl index 37ae257dd4..bbe1ac4af8 100644 --- a/public/templates/outgoing.tpl +++ b/public/templates/outgoing.tpl @@ -4,17 +4,17 @@ <a href="/" itemprop="url"><span itemprop="title">Home</span></a> </li> <li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb"> - <span itemprop="title">Outgoing Link</span> + <span itemprop="title">[[notifications:outgoing_link]]</span> </li> </ol> <div class="well"> <h3> - You are now leaving {title}. + [[notifications:outgoing_link_message]] {title}. </h3> <p> - <a href="{url}" rel="nofollow" class="btn btn-primary btn-lg">Continue to {url}</a> - <a id="return-btn" href="#" class="btn btn-lg btn-warning">Return to {title}</a> + <a href="{url}" rel="nofollow" class="btn btn-primary btn-lg">[[notifications:continue_to]] {url}</a> + <a id="return-btn" href="#" class="btn btn-lg btn-warning">[[notifications:return_to]] {title}</a> </p> </div> </div> @@ -24,4 +24,4 @@ history.back(); return false; }); -</script> \ No newline at end of file +</script> diff --git a/public/templates/reset.tpl b/public/templates/reset.tpl index 3ac48f2752..7e6f996f46 100644 --- a/public/templates/reset.tpl +++ b/public/templates/reset.tpl @@ -1,28 +1,28 @@ <ol class="breadcrumb"> <li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb"> - <a href="/" itemprop="url"><span itemprop="title">Home</span></a> + <a href="/" itemprop="url"><span itemprop="title">[[global:home]]</span></a> </li> <li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb"> - <span itemprop="title">Reset Password</span> + <span itemprop="title">[[reset_password:reset_password]]</span> </li> </ol> <div class="alert alert-info"> - Please enter your <strong>email address</strong> and we will send you an email with instructions on how to reset your account. + [[reset_password:reset_password:enter_email]] </div> <div class="well"> <div class="alert alert-success" id="success" style="display:none"> <button type="button" class="close" data-dismiss="alert">×</button> - <strong>Password Reset Sent</strong> + <strong>[[reset_password:password_reset_sent]]</strong> </div> <div class="alert alert-danger" id="error" style="display:none"> <button type="button" class="close" data-dismiss="alert">×</button> - <strong>Invalid Email / Email does not exist!</strong> + <strong>[[reset_password:invalid_email]]</strong> </div> <form onsubmit="return false;"> <input type="text" class="form-control input-block input-lg" placeholder="Enter Email Address" id="email" /> <br /> - <button class="btn btn-primary btn-block btn-lg" id="reset" type="submit">Reset Password</button> + <button class="btn btn-primary btn-block btn-lg" id="reset" type="submit">[[reset_password:reset_password]]</button> </form> </div> diff --git a/public/templates/reset_code.tpl b/public/templates/reset_code.tpl index 0f145d4f48..40a2dee402 100644 --- a/public/templates/reset_code.tpl +++ b/public/templates/reset_code.tpl @@ -1,12 +1,12 @@ <ol class="breadcrumb"> <li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb"> - <a href="/" itemprop="url"><span itemprop="title">Home</span></a> + <a href="/" itemprop="url"><span itemprop="title">[[global:home]]</span></a> </li> <li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb"> - <a href="/reset" itemprop="url"><span itemprop="title">Reset Password</span></a> + <a href="/reset" itemprop="url"><span itemprop="title">[[reset_password:reset_password]]</span></a> </li> <li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb"> - <span itemprop="title">Update Password</span> + <span itemprop="title">[[reset_password:update_password]]</span> </li> </ol> @@ -14,23 +14,23 @@ <div class="well"> <div class="alert alert-success" id="success" style="display:none"> <button type="button" class="close" data-dismiss="alert">×</button> - <strong>Password Changed</strong> - <p>Password successfully reset, please <a href="/login">log in again</a>.</p> + <strong>[[reset_password:password_changed.title]]</strong> + <p>[[reset_password:password_changed.message]]</p> </div> <div class="alert alert-warning" id="notice" style="display:none"> <strong></strong> <p></p> </div> <div class="alert alert-danger" id="error" style="display:none"> - <strong>Incorrect Reset Code</strong> - <p>The reset code received was incorrect. Please try again, or <a href="/reset">request a new reset code</a></p> + <strong>[[reset_password:wrong_reset_code.title]]</strong> + <p>[[reset_password:wrong_reset_code.message]]</p> </div> <form onsubmit="return false;" id="reset-form"> - <label for="password">New Password</label> + <label for="password">[[reset_password:new_password]]</label> <input class="form-control input-lg" type="password" placeholder="A new password" id="password" /><br /> - <label for="repeat">Confirm Password</label> + <label for="repeat">[[reset_password:repeat_password]]</label> <input class="form-control input-lg" type="password" placeholder="The same password" id="repeat" /><br /> - <button class="btn btn-primary btn-lg btn-block" id="reset" type="submit" disabled>Reset Password</button> + <button class="btn btn-primary btn-lg btn-block" id="reset" type="submit" disabled>[[reset_password:reset_password]]</button> </form> </div> <input type="hidden" template-variable="reset_code" value="{reset_code}" /> diff --git a/public/templates/search.tpl b/public/templates/search.tpl index 87c57c3ca1..9bea91611c 100644 --- a/public/templates/search.tpl +++ b/public/templates/search.tpl @@ -1,6 +1,6 @@ <ol class="breadcrumb"> - <li><a href="/">Home</a></li> - <li class="active">Search</li> + <li><a href="/">[[global:home]]</a></li> + <li class="active">[[global:header.search]]</li> </ol> @@ -9,15 +9,15 @@ <div class="form-group"> <input type="text" class="form-control" placeholder="Search" name="query" value=""> </div> - <button type="submit" class="btn btn-default hide">Search</button> + <button type="submit" class="btn btn-default hide">[[global:header.search]]</button> </div> </form> <div class="category search"> <div class="{show_results}"> <ul id="topics-container" data-search-query="{search_query}"> - <h3>Topics</h3> - <div class="alert alert-info {show_no_topics}">No topics found!</div> + <h3>[[topic:topics]]</h3> + <div class="alert alert-info {show_no_topics}">[[topic:no_topics_found]]</div> <!-- BEGIN topics --> <a href="../../topic/{topics.slug}" id="tid-{topics.tid}"> <li class="category-item"> diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl index 89a0ea6262..47d068dcef 100644 --- a/public/templates/topic.tpl +++ b/public/templates/topic.tpl @@ -52,7 +52,7 @@ <div class="topic-buttons"> <div class="btn-group"> - <button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" type="button" title="Posted by {posts.username}"> + <button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" type="button" title="[[topic:posted_by]] {posts.username}"> <span class="username-field" href="/user/{posts.userslug}" itemprop="author">{posts.username} </span> <span class="caret"></span> </button> @@ -111,9 +111,9 @@ {posts.additional_profile_info} </span> <span class="pull-right"> - posted <span class="relativeTimeAgo timeago" title="{posts.relativeTime}"></span> + [[category:posted]] <span class="relativeTimeAgo timeago" title="{posts.relativeTime}"></span> <!-- IF posts.editor --> - <span>| last edited by <strong><a href="/user/{posts.editorslug}">{posts.editorname}</a></strong></span> + <span>| [[category:last_edited_by]] <strong><a href="/user/{posts.editorslug}">{posts.editorname}</a></strong></span> <span class="timeago" title="{posts.relativeEditTime}"></span> <!-- ENDIF posts.editor --> </span> @@ -127,11 +127,11 @@ <li class="well post-bar"> <div class="inline-block"> <small class="topic-stats"> - <span>posts</span> + <span>[[category:posts]]</span> <strong><span id="topic-post-count" class="human-readable-number" title="{postcount}">{postcount}</span></strong> | - <span>views</span> + <span>[[category:views]]</span> <strong><span class="human-readable-number" title="{viewcount}">{viewcount}</span></strong> | - <span>browsing</span> + <span>[[category:browsing]]</span> </small> <div class="thread_active_users active-users inline-block"></div> </div> @@ -158,7 +158,7 @@ <div class="well col-md-11 col-xs-12 pull-right hide"> <div class="topic-main-buttons pull-right inline-block hide"> <div class="loading-indicator" done="0" style="display:none;"> - Loading <span class="hidden-xs" style="display:inline!important;">More Posts</span> <i class="fa fa-refresh fa-spin"></i> + [[topic:loading]] <span class="hidden-xs" style="display:inline!important;">[[topic:more_posts]]</span> <i class="fa fa-refresh fa-spin"></i> </div> <button class="btn btn-primary post_reply" type="button">[[topic:reply]]</button> <div class="btn-group thread-tools hide"> @@ -181,7 +181,7 @@ <div class="modal-content"> <div class="modal-header"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> - <h3>Move Topic</h3> + <h3>[[topic:move_topic]]</h3> </div> <div class="modal-body"> <p id="categories-loading"><i class="fa fa-spin fa-refresh"></i> [[topic:load_categories]]</p> @@ -191,7 +191,7 @@ </p> <div id="move-confirm" style="display: none;"> <hr /> - <div class="alert alert-info">This topic will be moved to the category <strong><span id="confirm-category-name"></span></strong></div> + <div class="alert alert-info">[[topic:topic_will_be_moved_to]] <strong><span id="confirm-category-name"></span></strong></div> </div> </div> <div class="modal-footer"> @@ -203,4 +203,4 @@ </div> </div> -</div> \ No newline at end of file +</div>