hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/designcreateplay/NodeBB

Browse Source
v1.18.x
Baris Soner Usakli 11 years ago
parent e4b6d0e1ff a8d2b46911
commit 55b5d0c209
21 changed files with 149 additions and 99 deletions
Show Stats Download Patch File Download Diff File

4
public/language/es/global.json
Unescape Escape View File

@ -44,12 +44,12 @@
"alert.banned.message": "Estás baneado, serás desconectado!", "alert.banned.message": "Estás baneado, serás desconectado!",
"alert.unfollow": "Ya no estás siguiendo a %1!", "alert.unfollow": "Ya no estás siguiendo a %1!",
"alert.follow": "Estás siguiendo a %1!", "alert.follow": "Estás siguiendo a %1!",
"posts": "Publicaciones", "posts": "Posts",
"views": "Visitas", "views": "Visitas",
"posted": "publicado", "posted": "publicado",
"in": "en", "in": "en",
"recentposts": "Publicaciones Recientes", "recentposts": "Publicaciones Recientes",
"recentips": "Recently Logged In IPs", "recentips": "Conexions recientes de estas IP's",
"online": "Conectado", "online": "Conectado",
"away": "No disponible", "away": "No disponible",
"dnd": "No molestar", "dnd": "No molestar",

2
public/language/es/pages.json
Unescape Escape View File

@ -8,7 +8,7 @@
"user.edit": "Editando \"%1\"", "user.edit": "Editando \"%1\"",
"user.following": "Gente que sigue %1 ", "user.following": "Gente que sigue %1 ",
"user.followers": "Seguidores de %1", "user.followers": "Seguidores de %1",
"user.posts": "Posts made by %1", "user.posts": "Posteos de %1",
"user.favourites": "Publicaciones favoritas de %1 ", "user.favourites": "Publicaciones favoritas de %1 ",
"user.settings": "Preferencias del Usuario" "user.settings": "Preferencias del Usuario"
} }

22
public/language/es/topic.json
Unescape Escape View File

@ -11,7 +11,7 @@
"reply": "Responder", "reply": "Responder",
"edit": "Editar", "edit": "Editar",
"delete": "Borrar", "delete": "Borrar",
"restore": "Restore", "restore": "Restaurar",
"move": "Mover", "move": "Mover",
"fork": "Bifurcar", "fork": "Bifurcar",
"banned": "baneado", "banned": "baneado",
@ -19,15 +19,15 @@
"share": "Compartir", "share": "Compartir",
"tools": "Herramientas", "tools": "Herramientas",
"flag": "Reportar", "flag": "Reportar",
"bookmark_instructions": "Click here to return to your last position or close to discard.", "bookmark_instructions": "Click aqui para restablecer la ultima posicion del post o cierralo para descartar cambios.",
"flag_title": "Reportar esta publicación a los moderadores", "flag_title": "Reportar esta publicación a los moderadores",
"deleted_message": "Este tema ha sido borrado. Solo los miembros con privilegios pueden verlo.", "deleted_message": "Este tema ha sido borrado. Solo los miembros con privilegios pueden verlo.",
"following_topic.title": "Siguendo tema", "following_topic.title": "Siguendo tema",
"following_topic.message": "Ahora recibiras notificaciones cuando alguien publique en este tema.", "following_topic.message": "Ahora recibiras notificaciones cuando alguien publique en este tema.",
"not_following_topic.title": "No sigues este tema", "not_following_topic.title": "No sigues este tema",
"not_following_topic.message": "No recibiras notificaciones de este tema.", "not_following_topic.message": "No recibiras notificaciones de este tema.",
"login_to_subscribe": "Please register or log in in order to subscribe to this topic.", "login_to_subscribe": "Por favor, conectate para subscribirte a este tema.",
"markAsUnreadForAll.success": "Topic marked as unread for all.", "markAsUnreadForAll.success": "Marcar todo como leeido.",
"watch": "Seguir", "watch": "Seguir",
"share_this_post": "Compartir este post", "share_this_post": "Compartir este post",
"thread_tools.title": "Herramientas del Tema", "thread_tools.title": "Herramientas del Tema",
@ -66,17 +66,17 @@
"composer.title_placeholder": "Ingresa el titulo de tu tema", "composer.title_placeholder": "Ingresa el titulo de tu tema",
"composer.write": "Escribe", "composer.write": "Escribe",
"composer.preview": "Previsualización", "composer.preview": "Previsualización",
"composer.help": "Help", "composer.help": "Ayuda",
"composer.discard": "Descartar", "composer.discard": "Descartar",
"composer.submit": "Enviar", "composer.submit": "Enviar",
"composer.replying_to": "Respondiendo a", "composer.replying_to": "Respondiendo a",
"composer.new_topic": "Nuevo Tema", "composer.new_topic": "Nuevo Tema",
"composer.uploading": "uploading...", "composer.uploading": "cargando...",
"composer.thumb_url_label": "Paste a topic thumbnail URL", "composer.thumb_url_label": "Agregar imagen destacada a este tema.",
"composer.thumb_title": "Add a thumbnail to this topic", "composer.thumb_title": "Agregar miniatura a este tema.",
"composer.thumb_url_placeholder": "http://example.com/thumb.png", "composer.thumb_url_placeholder": "http://ejemplo.com/mini.png",
"composer.thumb_file_label": "Or upload a file", "composer.thumb_file_label": "Cargar una foto",
"composer.thumb_remove": "Clear fields", "composer.thumb_remove": "Limpiar campos.",
"composer.drag_and_drop_images": "Arrastra las imagenes aqui", "composer.drag_and_drop_images": "Arrastra las imagenes aqui",
"composer.upload_instructions": "Carga tus imagenes con solo arrastrarlas aqui." "composer.upload_instructions": "Carga tus imagenes con solo arrastrarlas aqui."
} }

2
public/language/fr/pages.json
Unescape Escape View File

@ -8,7 +8,7 @@
"user.edit": "Edite \"%1\"", "user.edit": "Edite \"%1\"",
"user.following": "Personnes que %1 suit", "user.following": "Personnes que %1 suit",
"user.followers": "Personnes qui suivent %1", "user.followers": "Personnes qui suivent %1",
"user.posts": "Posts made by %1", "user.posts": "Message écrit par %1",
"user.favourites": "Messages favoris de %1", "user.favourites": "Messages favoris de %1",
"user.settings": "Préférences Utilisateur" "user.settings": "Préférences Utilisateur"
} }

22
public/language/fr/topic.json
Unescape Escape View File

@ -11,7 +11,7 @@
"reply": "Répondre", "reply": "Répondre",
"edit": "Editer", "edit": "Editer",
"delete": "Supprimer", "delete": "Supprimer",
"restore": "Restore", "restore": "Restaurer",
"move": "Déplacer", "move": "Déplacer",
"fork": "Scinder", "fork": "Scinder",
"banned": "bannis", "banned": "bannis",
@ -19,15 +19,15 @@
"share": "Partager", "share": "Partager",
"tools": "Outils", "tools": "Outils",
"flag": "Signaler", "flag": "Signaler",
"bookmark_instructions": "Click here to return to your last position or close to discard.", "bookmark_instructions": "Cliquer ici pour retourner à votre dernière position ou fermer pour ignorer.",
"flag_title": "Signaler ce post pour modération", "flag_title": "Signaler ce post pour modération",
"deleted_message": "Ce sujet a été supprimé. Seuls les utilsateurs avec les droits d'administration peuvent le voir.", "deleted_message": "Ce sujet a été supprimé. Seuls les utilsateurs avec les droits d'administration peuvent le voir.",
"following_topic.title": "Sujet suivi", "following_topic.title": "Sujet suivi",
"following_topic.message": "Vous recevrez désormais des notifications lorsque quelqu'un postera dans ce sujet.", "following_topic.message": "Vous recevrez désormais des notifications lorsque quelqu'un postera dans ce sujet.",
"not_following_topic.title": "Sujet non suivi", "not_following_topic.title": "Sujet non suivi",
"not_following_topic.message": "Vous ne recevrez plus de notifications pour ce sujet.", "not_following_topic.message": "Vous ne recevrez plus de notifications pour ce sujet.",
"login_to_subscribe": "Please register or log in in order to subscribe to this topic.", "login_to_subscribe": "Veuillez vous enregistrer ou vous connecter afin de souscrire à ce sujet.",
"markAsUnreadForAll.success": "Topic marked as unread for all.", "markAsUnreadForAll.success": "Sujet marqué comme non lu pour tout le monde.",
"watch": "Suivre", "watch": "Suivre",
"share_this_post": "Partager ce message", "share_this_post": "Partager ce message",
"thread_tools.title": "Outils du Fil", "thread_tools.title": "Outils du Fil",
@ -66,17 +66,17 @@
"composer.title_placeholder": "Entrer le titre du sujet ici...", "composer.title_placeholder": "Entrer le titre du sujet ici...",
"composer.write": "Ecriture", "composer.write": "Ecriture",
"composer.preview": "Aperçu", "composer.preview": "Aperçu",
"composer.help": "Help", "composer.help": "Aide",
"composer.discard": "Abandon", "composer.discard": "Abandon",
"composer.submit": "Envoi", "composer.submit": "Envoi",
"composer.replying_to": "Répondre à", "composer.replying_to": "Répondre à",
"composer.new_topic": "Nouveau Sujet", "composer.new_topic": "Nouveau Sujet",
"composer.uploading": "uploading...", "composer.uploading": "téléchargement...",
"composer.thumb_url_label": "Paste a topic thumbnail URL", "composer.thumb_url_label": "Coller une URL de vignette du sujet",
"composer.thumb_title": "Add a thumbnail to this topic", "composer.thumb_title": "Ajouter une vignette à ce sujet",
"composer.thumb_url_placeholder": "http://example.com/thumb.png", "composer.thumb_url_placeholder": "http://exemple.com/vignette.png",
"composer.thumb_file_label": "Or upload a file", "composer.thumb_file_label": "Ou télécharger un fichier",
"composer.thumb_remove": "Clear fields", "composer.thumb_remove": "Effacer les champs",
"composer.drag_and_drop_images": "Glisser-déposer ici les images", "composer.drag_and_drop_images": "Glisser-déposer ici les images",
"composer.upload_instructions": "Uploader des images par glisser-déposer." "composer.upload_instructions": "Uploader des images par glisser-déposer."
} }

2
public/language/nb/global.json
Unescape Escape View File

@ -49,7 +49,7 @@
"posted": "skapt", "posted": "skapt",
"in": "i", "in": "i",
"recentposts": "Seneste innlegg", "recentposts": "Seneste innlegg",
"recentips": "Recently Logged In IPs", "recentips": "Seneste innloggede IP-er",
"online": "Online", "online": "Online",
"away": "Borte", "away": "Borte",
"dnd": "Ikke forsturr", "dnd": "Ikke forsturr",

2
public/language/nb/pages.json
Unescape Escape View File

@ -8,7 +8,7 @@
"user.edit": "Endrer \"%1\"", "user.edit": "Endrer \"%1\"",
"user.following": "Personer %1 følger", "user.following": "Personer %1 følger",
"user.followers": "Personer som følger %1", "user.followers": "Personer som følger %1",
"user.posts": "Posts made by %1", "user.posts": "Innlegg laget av %1",
"user.favourites": "%1 sine favoritt-innlegg", "user.favourites": "%1 sine favoritt-innlegg",
"user.settings": "Brukerinnstillinger" "user.settings": "Brukerinnstillinger"
} }

20
public/language/nb/topic.json
Unescape Escape View File

@ -11,7 +11,7 @@
"reply": "Svar", "reply": "Svar",
"edit": "Endre", "edit": "Endre",
"delete": "Slett", "delete": "Slett",
"restore": "Restore", "restore": "Gjenopprett",
"move": "Flytt", "move": "Flytt",
"fork": "Del", "fork": "Del",
"banned": "utestengt", "banned": "utestengt",
@ -19,15 +19,15 @@
"share": "Del", "share": "Del",
"tools": "Verktøy", "tools": "Verktøy",
"flag": "Rapporter", "flag": "Rapporter",
"bookmark_instructions": "Click here to return to your last position or close to discard.", "bookmark_instructions": "Klikk her for å returnere til din siste posisjon eller lukk for å forkaste.",
"flag_title": "Rapporter dette innlegget for granskning", "flag_title": "Rapporter dette innlegget for granskning",
"deleted_message": "Denne tråden har blitt slettet. Bare brukere med trådhåndterings-privilegier kan se den.", "deleted_message": "Denne tråden har blitt slettet. Bare brukere med trådhåndterings-privilegier kan se den.",
"following_topic.title": "Følger tråd", "following_topic.title": "Følger tråd",
"following_topic.message": "Du vil nå motta varsler når noen skriver i denne tråden.", "following_topic.message": "Du vil nå motta varsler når noen skriver i denne tråden.",
"not_following_topic.title": "Følger ikke tråd", "not_following_topic.title": "Følger ikke tråd",
"not_following_topic.message": "Du vil ikke lenger motta varsler fra denne tråden.", "not_following_topic.message": "Du vil ikke lenger motta varsler fra denne tråden.",
"login_to_subscribe": "Please register or log in in order to subscribe to this topic.", "login_to_subscribe": "Vennligst registrer deg eller logg inn for å abonnere på denne tråden.",
"markAsUnreadForAll.success": "Topic marked as unread for all.", "markAsUnreadForAll.success": "Tråd markert som ulest for alle.",
"watch": "Overvåk", "watch": "Overvåk",
"share_this_post": "Del ditt innlegg", "share_this_post": "Del ditt innlegg",
"thread_tools.title": "Trådverktøy", "thread_tools.title": "Trådverktøy",
@ -66,17 +66,17 @@
"composer.title_placeholder": "Skriv din tråd-tittel her", "composer.title_placeholder": "Skriv din tråd-tittel her",
"composer.write": "Skriv", "composer.write": "Skriv",
"composer.preview": "Forhåndsvis", "composer.preview": "Forhåndsvis",
"composer.help": "Help", "composer.help": "Hjelp",
"composer.discard": "Forkast", "composer.discard": "Forkast",
"composer.submit": "Send", "composer.submit": "Send",
"composer.replying_to": "Svarer til", "composer.replying_to": "Svarer til",
"composer.new_topic": "Ny tråd", "composer.new_topic": "Ny tråd",
"composer.uploading": "uploading...", "composer.uploading": "laster opp...",
"composer.thumb_url_label": "Paste a topic thumbnail URL", "composer.thumb_url_label": "Lim inn som tråd-minatyr URL",
"composer.thumb_title": "Add a thumbnail to this topic", "composer.thumb_title": "Legg til minatyr til denne tråden",
"composer.thumb_url_placeholder": "http://example.com/thumb.png", "composer.thumb_url_placeholder": "http://example.com/thumb.png",
"composer.thumb_file_label": "Or upload a file", "composer.thumb_file_label": "Eller last opp en fil",
"composer.thumb_remove": "Clear fields", "composer.thumb_remove": "Tøm felter",
"composer.drag_and_drop_images": "Dra og slipp bilder her", "composer.drag_and_drop_images": "Dra og slipp bilder her",
"composer.upload_instructions": "Last opp bilder ved å dra og slippe dem." "composer.upload_instructions": "Last opp bilder ved å dra og slippe dem."
} }

2
public/language/sv/category.json
Unescape Escape View File

@ -2,7 +2,7 @@
"new_topic_button": "Nytt ämne", "new_topic_button": "Nytt ämne",
"no_topics": "<strong>Det finns inga ämnen i denna kategori.</strong><br />Varför inte skapa ett?", "no_topics": "<strong>Det finns inga ämnen i denna kategori.</strong><br />Varför inte skapa ett?",
"posts": "inlägg", "posts": "inlägg",
"views": "tittningar", "views": "visningar",
"posted": "skapad", "posted": "skapad",
"browsing": "läser", "browsing": "läser",
"no_replies": "Ingen har svarat", "no_replies": "Ingen har svarat",

12
public/language/sv/global.json
Unescape Escape View File

@ -10,16 +10,16 @@
"500.message": "Hoppsan! Verkar som att något gått snett!", "500.message": "Hoppsan! Verkar som att något gått snett!",
"register": "Registrera", "register": "Registrera",
"login": "Logga in", "login": "Logga in",
"please_log_in": "Please Log In", "please_log_in": "Var god logga in",
"posting_restriction_info": "Posting is currently restricted to registered members only, click here to log in.", "posting_restriction_info": "Man måste vara inloggad för att kunna skapa inlägg, klicka här för att logga in.",
"welcome_back": "Welcome Back ", "welcome_back": "Välkommen tillbaka",
"you_have_successfully_logged_in": "You have successfully logged in", "you_have_successfully_logged_in": "Inloggningen lyckades",
"logout": "Logga ut", "logout": "Logga ut",
"logout.title": "Du är nu utloggad.", "logout.title": "Du är nu utloggad.",
"logout.message": "Du är nu utloggad från NodeBB.", "logout.message": "Du är nu utloggad från NodeBB.",
"save_changes": "Spara ändringar", "save_changes": "Spara ändringar",
"close": "Stäng", "close": "Stäng",
"pagination": "Pagination", "pagination": "Siduppdelning",
"header.admin": "Admin", "header.admin": "Admin",
"header.recent": "Senaste", "header.recent": "Senaste",
"header.unread": "Olästa", "header.unread": "Olästa",
@ -49,7 +49,7 @@
"posted": "svarade", "posted": "svarade",
"in": "i", "in": "i",
"recentposts": "Senaste ämnena", "recentposts": "Senaste ämnena",
"recentips": "Recently Logged In IPs", "recentips": "Nyligen inloggade IPn",
"online": "Online", "online": "Online",
"away": "Borta", "away": "Borta",
"dnd": "Stör ej", "dnd": "Stör ej",

2
public/language/sv/notifications.json
Unescape Escape View File

@ -1,6 +1,6 @@
{ {
"title": "Notiser", "title": "Notiser",
"no_notifs": "You have no new notifications", "no_notifs": "Du har inga nya notiser",
"see_all": "Visa alla notiser", "see_all": "Visa alla notiser",
"back_to_home": "Tillbaka till NodeBB", "back_to_home": "Tillbaka till NodeBB",
"outgoing_link": "Utgående länk", "outgoing_link": "Utgående länk",

4
public/language/sv/pages.json
Unescape Escape View File

@ -1,14 +1,14 @@
{ {
"home": "Hem", "home": "Hem",
"unread": "Olästa ämnen", "unread": "Olästa ämnen",
"popular": "Popular Topics", "popular": "Populära ämnen",
"recent": "Senaste ämnena", "recent": "Senaste ämnena",
"users": "Registrerade användare", "users": "Registrerade användare",
"notifications": "Notiser", "notifications": "Notiser",
"user.edit": "Ändrar \"%1\"", "user.edit": "Ändrar \"%1\"",
"user.following": "Personer %1 Följer", "user.following": "Personer %1 Följer",
"user.followers": "Personer som följer %1", "user.followers": "Personer som följer %1",
"user.posts": "Posts made by %1", "user.posts": "Inlägg skapat av %1",
"user.favourites": "%1's favorit-inlägg", "user.favourites": "%1's favorit-inlägg",
"user.settings": "Avnändarinställningar" "user.settings": "Avnändarinställningar"
} }

36
public/language/sv/topic.json
Unescape Escape View File

@ -11,7 +11,7 @@
"reply": "Svara", "reply": "Svara",
"edit": "Ändra", "edit": "Ändra",
"delete": "Ta bort", "delete": "Ta bort",
"restore": "Restore", "restore": "Återställ",
"move": "Flytta", "move": "Flytta",
"fork": "Grena", "fork": "Grena",
"banned": "bannad", "banned": "bannad",
@ -19,17 +19,17 @@
"share": "Dela", "share": "Dela",
"tools": "Verktyg", "tools": "Verktyg",
"flag": "Rapportera", "flag": "Rapportera",
"bookmark_instructions": "Click here to return to your last position or close to discard.", "bookmark_instructions": "Klicka här för att återgå till den senaste positionen eller stäng för att kasta.",
"flag_title": "Rapportera detta inlägg för granskning", "flag_title": "Rapportera detta inlägg för granskning",
"deleted_message": "Denna tråd har tagits bort. Endast användare med administrations-rättigheter kan se den.", "deleted_message": "Denna tråd har tagits bort. Endast användare med administrations-rättigheter kan se den.",
"following_topic.title": "Following Topic", "following_topic.title": "Följer ämne",
"following_topic.message": "You will now be receiving notifications when somebody posts to this topic.", "following_topic.message": "Du kommer nu få notiser när någon gör inlägg i detta ämne.",
"not_following_topic.title": "Not Following Topic", "not_following_topic.title": "Du följer inte ämnet",
"not_following_topic.message": "You will no longer receive notifications from this topic.", "not_following_topic.message": "Du kommer inte längre få notiser från detta ämne.",
"login_to_subscribe": "Please register or log in in order to subscribe to this topic.", "login_to_subscribe": "Var god registrera eller logga in för att kunna prenumerera på detta ämne.",
"markAsUnreadForAll.success": "Topic marked as unread for all.", "markAsUnreadForAll.success": "Ämne markerat som oläst av alla.",
"watch": "Watch", "watch": "Följ",
"share_this_post": "Share this Post", "share_this_post": "Dela detta inlägg",
"thread_tools.title": "Trådverktyg", "thread_tools.title": "Trådverktyg",
"thread_tools.markAsUnreadForAll": "Markera som oläst", "thread_tools.markAsUnreadForAll": "Markera som oläst",
"thread_tools.pin": "Fäst ämne", "thread_tools.pin": "Fäst ämne",
@ -66,17 +66,17 @@
"composer.title_placeholder": "Skriv in ämnets titel här...", "composer.title_placeholder": "Skriv in ämnets titel här...",
"composer.write": "Skriv", "composer.write": "Skriv",
"composer.preview": "Förhandsgranska", "composer.preview": "Förhandsgranska",
"composer.help": "Help", "composer.help": "Hjälp",
"composer.discard": "Avbryt", "composer.discard": "Avbryt",
"composer.submit": "Spara", "composer.submit": "Spara",
"composer.replying_to": "Svarar till", "composer.replying_to": "Svarar till",
"composer.new_topic": "Nytt ämne", "composer.new_topic": "Nytt ämne",
"composer.uploading": "uploading...", "composer.uploading": "laddar upp...",
"composer.thumb_url_label": "Paste a topic thumbnail URL", "composer.thumb_url_label": "Klistra in URL till tumnagel för ämnet",
"composer.thumb_title": "Add a thumbnail to this topic", "composer.thumb_title": "Lägg till tumnagel för detta ämne",
"composer.thumb_url_placeholder": "http://example.com/thumb.png", "composer.thumb_url_placeholder": "http://example.com/thumb.png",
"composer.thumb_file_label": "Or upload a file", "composer.thumb_file_label": "Eller ladda upp en fil",
"composer.thumb_remove": "Clear fields", "composer.thumb_remove": "Töm fält",
"composer.drag_and_drop_images": "Drag and Drop Images Here", "composer.drag_and_drop_images": "Dra och släpp bilder här",
"composer.upload_instructions": "Upload images by dragging & dropping them." "composer.upload_instructions": "Ladda upp bilder genom att dra och släpp dem."
} }

16
public/language/sv/user.json
Unescape Escape View File

@ -19,20 +19,20 @@
"signature": "Signatur", "signature": "Signatur",
"gravatar": "Gravatar", "gravatar": "Gravatar",
"birthday": "Födelsedag", "birthday": "Födelsedag",
"chat": "Chat", "chat": "Chatta",
"follow": "Follow", "follow": "Följ",
"unfollow": "Unfollow", "unfollow": "Sluta följ",
"change_picture": "Ändra bild", "change_picture": "Ändra bild",
"edit": "Ändra", "edit": "Ändra",
"uploaded_picture": "Uppladdad bild", "uploaded_picture": "Uppladdad bild",
"upload_new_picture": "Ladda upp ny bild", "upload_new_picture": "Ladda upp ny bild",
"current_password": "Current Password", "current_password": "Nuvarande lösenord",
"change_password": "Ändra lösenord", "change_password": "Ändra lösenord",
"confirm_password": "Bekräfta lösenord", "confirm_password": "Bekräfta lösenord",
"password": "Lösenord", "password": "Lösenord",
"upload_picture": "Ladda upp bild", "upload_picture": "Ladda upp bild",
"upload_a_picture": "Ladda upp en bild", "upload_a_picture": "Ladda upp en bild",
"image_spec": "You may only upload PNG, JPG, or GIF files", "image_spec": "Du får bara ladda upp PNG, JPG eller GIF-filer",
"max": "max.", "max": "max.",
"settings": "Inställningar", "settings": "Inställningar",
"show_email": "Visa min epost", "show_email": "Visa min epost",
@ -41,7 +41,7 @@
"has_no_posts": "Denna användare har inte gjort några inlägg än.", "has_no_posts": "Denna användare har inte gjort några inlägg än.",
"email_hidden": "Epost dold", "email_hidden": "Epost dold",
"hidden": "dold", "hidden": "dold",
"paginate_description": "Paginate topics and posts instead of using infinite scroll.", "paginate_description": "Gör så att ämnen och inlägg visas som sidor istället för oändlig scroll.",
"topics_per_page": "Topics per Page", "topics_per_page": "Ämnen per sida",
"posts_per_page": "Posts per Page" "posts_per_page": "Inlägg per sida"
} }

2
public/language/zh_CN/global.json
Unescape Escape View File

@ -49,7 +49,7 @@
"posted": "发布", "posted": "发布",
"in": "在", "in": "在",
"recentposts": "最新发表", "recentposts": "最新发表",
"recentips": "Recently Logged In IPs", "recentips": "最近登录ip",
"online": " 在线", "online": " 在线",
"away": "离开", "away": "离开",
"dnd": "不打扰", "dnd": "不打扰",

2
public/language/zh_CN/pages.json
Unescape Escape View File

@ -8,7 +8,7 @@
"user.edit": "编辑 \"%1\"", "user.edit": "编辑 \"%1\"",
"user.following": "%1的人关注", "user.following": "%1的人关注",
"user.followers": "%1关注的人", "user.followers": "%1关注的人",
"user.posts": "Posts made by %1", "user.posts": "%1 发表",
"user.favourites": "%1 喜爱的帖子", "user.favourites": "%1 喜爱的帖子",
"user.settings": "用户设置" "user.settings": "用户设置"
} }

20
public/language/zh_CN/topic.json
Unescape Escape View File

@ -11,7 +11,7 @@
"reply": "回复", "reply": "回复",
"edit": "编辑", "edit": "编辑",
"delete": "删除", "delete": "删除",
"restore": "Restore", "restore": "恢复",
"move": "移动", "move": "移动",
"fork": "作为主题", "fork": "作为主题",
"banned": "禁止", "banned": "禁止",
@ -19,15 +19,15 @@
"share": "分享", "share": "分享",
"tools": "工具", "tools": "工具",
"flag": "标志", "flag": "标志",
"bookmark_instructions": "Click here to return to your last position or close to discard.", "bookmark_instructions": "点击这里返回你最初的位置或退出。",
"flag_title": "标志受限的帖子", "flag_title": "标志受限的帖子",
"deleted_message": "这个帖子已经删除，只有帖子的拥有者才有权限去查看。", "deleted_message": "这个帖子已经删除，只有帖子的拥有者才有权限去查看。",
"following_topic.title": "关注该主题", "following_topic.title": "关注该主题",
"following_topic.message": "当有回复提交的时候你将会收到通知。", "following_topic.message": "当有回复提交的时候你将会收到通知。",
"not_following_topic.title": "非关注主题", "not_following_topic.title": "非关注主题",
"not_following_topic.message": "你将不再接受来自该帖子的通知。", "not_following_topic.message": "你将不再接受来自该帖子的通知。",
"login_to_subscribe": "Please register or log in in order to subscribe to this topic.", "login_to_subscribe": "请注册或登录以订阅该主题。",
"markAsUnreadForAll.success": "Topic marked as unread for all.", "markAsUnreadForAll.success": "标记所有未读主题",
"watch": "查看", "watch": "查看",
"share_this_post": "分享帖子", "share_this_post": "分享帖子",
"thread_tools.title": "管理工具", "thread_tools.title": "管理工具",
@ -66,17 +66,17 @@
"composer.title_placeholder": "在这里输入你的主题标题...", "composer.title_placeholder": "在这里输入你的主题标题...",
"composer.write": "书写", "composer.write": "书写",
"composer.preview": "预览", "composer.preview": "预览",
"composer.help": "Help", "composer.help": "帮助",
"composer.discard": "丢弃", "composer.discard": "丢弃",
"composer.submit": "提交", "composer.submit": "提交",
"composer.replying_to": "回复", "composer.replying_to": "回复",
"composer.new_topic": "新主题", "composer.new_topic": "新主题",
"composer.uploading": "uploading...", "composer.uploading": "上传中...",
"composer.thumb_url_label": "Paste a topic thumbnail URL", "composer.thumb_url_label": "粘贴一个主题缩略图URL地址",
"composer.thumb_title": "Add a thumbnail to this topic", "composer.thumb_title": "为主题添加一个缩略图",
"composer.thumb_url_placeholder": "http://example.com/thumb.png", "composer.thumb_url_placeholder": "http://example.com/thumb.png",
"composer.thumb_file_label": "Or upload a file", "composer.thumb_file_label": "或上传一个文件",
"composer.thumb_remove": "Clear fields", "composer.thumb_remove": "清除字段",
"composer.drag_and_drop_images": "把图像拖到此处", "composer.drag_and_drop_images": "把图像拖到此处",
"composer.upload_instructions": "拖拽图片以上传" "composer.upload_instructions": "拖拽图片以上传"
} }

1
public/templates/header.tpl
Unescape Escape View File

@ -28,7 +28,6 @@
<script> <script>
var RELATIVE_PATH = "{relative_path}"; var RELATIVE_PATH = "{relative_path}";
</script> </script>
<script src="{relative_path}/socket.io/socket.io.js"></script>
<!-- BEGIN clientScripts --> <!-- BEGIN clientScripts -->
<script src="{relative_path}/{clientScripts.script}?{cache-buster}"></script> <script src="{relative_path}/{clientScripts.script}?{cache-buster}"></script>
<!-- END clientScripts --> <!-- END clientScripts -->

42
src/meta.js
Unescape Escape View File

@ -250,6 +250,7 @@ var fs = require('fs'),
jsPaths = scripts.map(function (jsPath) { jsPaths = scripts.map(function (jsPath) {
jsPath = path.normalize(jsPath); jsPath = path.normalize(jsPath);
// The filter:scripts.get plugin will be deprecated as of v0.5.0, specify scripts in plugin.json instead
if (jsPath.substring(0, 7) === 'plugins') { if (jsPath.substring(0, 7) === 'plugins') {
var matches = _.map(plugins.staticDirs, function(realPath, mappedPath) { var matches = _.map(plugins.staticDirs, function(realPath, mappedPath) {
if (jsPath.match(mappedPath)) { if (jsPath.match(mappedPath)) {
@ -260,7 +261,10 @@ var fs = require('fs'),
}).filter(function(a) { return a; }); }).filter(function(a) { return a; });
if (matches.length) { if (matches.length) {
var relPath = jsPath.slice(new String('plugins/' + matches[0]).length); var relPath = jsPath.slice(new String('plugins/' + matches[0]).length),
pluginId = matches[0].split(path.sep)[0];
winston.warn('[meta.scripts.get (' + pluginId + ')] filter:scripts.get is deprecated, consider using "scripts" in plugin.json');
return plugins.staticDirs[matches[0]] + relPath; return plugins.staticDirs[matches[0]] + relPath;
} else { } else {
winston.warn('[meta.scripts.get] Could not resolve mapped path: ' + jsPath + '. Are you sure it is defined by a plugin?'); winston.warn('[meta.scripts.get] Could not resolve mapped path: ' + jsPath + '. Are you sure it is defined by a plugin?');
@ -271,15 +275,18 @@ var fs = require('fs'),
} }
}); });
// Remove scripts that could not be found (remove this line at v0.5.0)
Meta.js.scripts = jsPaths.filter(function(path) { return path !== null }); Meta.js.scripts = jsPaths.filter(function(path) { return path !== null });
if (process.env.NODE_ENV !== 'development') { // Add socket.io client library
callback(null, [ Meta.js.scripts.unshift(path.join(__dirname, '../node_modules/socket.io/node_modules/socket.io-client/dist/socket.io.js'));
Meta.js.minFile
]); // Add plugin scripts
} else { Meta.js.scripts = Meta.js.scripts.concat(plugins.clientScripts);
callback(null, scripts);
} callback(null, [
Meta.js.minFile
]);
}); });
}, },
minify: function (callback) { minify: function (callback) {
@ -294,6 +301,25 @@ var fs = require('fs'),
minified = uglifyjs.minify(jsPaths); minified = uglifyjs.minify(jsPaths);
this.cache = minified.code; this.cache = minified.code;
callback(); callback();
},
concatenate: function(callback) {
if (process.env.NODE_ENV === 'development') {
winston.info('Concatenating client-side libraries into one file');
}
async.map(this.scripts, function(path, next) {
fs.readFile(path, { encoding: 'utf-8' }, next);
}, function(err, contents) {
if (err) {
winston.error('[meta.js.concatenate] Could not minify javascript! Error: ' + err.message);
process.exit();
}
Meta.js.cache = contents.reduce(function(output, src) {
return output.length ? output + ';\n' + src : src;
}, '');
callback();
});
} }
}; };

15
src/plugins.js
Unescape Escape View File

@ -17,6 +17,7 @@ var fs = require('fs'),
Plugins.staticDirs = {}; Plugins.staticDirs = {};
Plugins.cssFiles = []; Plugins.cssFiles = [];
Plugins.lessFiles = []; Plugins.lessFiles = [];
Plugins.clientScripts = [];
Plugins.initialized = false; Plugins.initialized = false;
@ -222,6 +223,20 @@ var fs = require('fs'),
})); }));
} }
next();
},
function(next) {
// Client-side scripts
if (pluginData.scripts && pluginData.scripts instanceof Array) {
if (global.env === 'development') {
winston.info('[plugins] Found ' + pluginData.scripts.length + ' js file(s) for plugin ' + pluginData.id);
}
Plugins.clientScripts = Plugins.clientScripts.concat(pluginData.scripts.map(function(file) {
return path.join(__dirname, '../node_modules/', pluginData.id, file);
}));
}
next(); next();
} }
], function(err) { ], function(err) {

18
src/routes/meta.js
Unescape Escape View File

@ -45,12 +45,22 @@ var path = require('path'),
}); });
app.get('/nodebb.min.js', function(req, res) { app.get('/nodebb.min.js', function(req, res) {
var sendCached = function() {
return res.type('text/javascript').send(meta.js.cache);
}
if (meta.js.cache) { if (meta.js.cache) {
res.type('text/javascript').send(meta.js.cache); sendCached();
} else { } else {
meta.js.minify(function() { if (app.enabled('minification')) {
res.type('text/javascript').send(meta.js.cache); meta.js.minify(function() {
}); sendCached();
});
} else {
// Compress only
meta.js.concatenate(function() {
sendCached();
});
}
} }
}); });
}; };

Write Preview
Loading…
Cancel
Save