diff --git a/config/assets.yml b/config/assets.yml index 51b6a9920..77f3df4e3 100644 --- a/config/assets.yml +++ b/config/assets.yml @@ -3,11 +3,6 @@ embed_assets: datauri compress_assets: on gzip_assets: off javascripts: - - flash_socket: - #- public/javascripts/vendor/FABridge.js - #- public/javascripts/vendor/swfobject.js - #- public/javascripts/vendor/web_socket.js jquery: - public/javascripts/vendor/jquery-1.7.1.min.js @@ -32,7 +27,6 @@ javascripts: - public/javascripts/vendor/jquery-debounce.js - public/javascripts/vendor/jquery.expander.js - public/javascripts/vendor/timeago.js - - public/javascripts/vendor/Mustache.js - public/javascripts/vendor/facebox.js - public/javascripts/jquery.infinitescroll-custom.js - public/javascripts/jquery.autocomplete-custom.js diff --git a/config/locales/javascript/javascript.ar.yml b/config/locales/javascript/javascript.ar.yml index 128bd5db8..4d8e64c25 100644 --- a/config/locales/javascript/javascript.ar.yml +++ b/config/locales/javascript/javascript.ar.yml @@ -10,11 +10,11 @@ ar: add_to_aspect: "أضف مراسلا" all_aspects: "جميع الفئات" toggle: - few: "في {{count}} فئات" - many: "في {{count}} فئات" - one: "في {{count}} فئة" - other: "في {{count}} فئات" - two: "في {{count}} فئات" + few: "في <%= count %> فئات" + many: "في <%= count %> فئات" + one: "في <%= count %> فئة" + other: "في <%= count %> فئات" + two: "في <%= count %> فئات" zero: "حدّد الفئات" comments: hide: "أخفِ التعليقات" @@ -32,7 +32,7 @@ ar: public: "عام - مشاركتك ستكون متاحة للجميع ومفهرسة في محركات البحث" reshares: duplicate: "رائع، أليس كذلك؟ أعدت نشر هذه المشاركة مسبقا" - search_for: "إبحث عن {{name}}" + search_for: "إبحث عن <%= name %>" show_more: المزيد timeago: day: "منذ يوم" @@ -51,6 +51,6 @@ ar: years: "منذ %d أعوام" videos: unknown: "نوع فيديو غير معروف" - watch: "شاهد هذا الفيديو عبر {{provider}}" + watch: "شاهد هذا الفيديو عبر <%= provider %>" web_sockets: disconnected: "الـ websocket مغلق; الرسائل لن تنشر بعد الآن" \ No newline at end of file diff --git a/config/locales/javascript/javascript.bg.yml b/config/locales/javascript/javascript.bg.yml index 03fdb2e24..a7acd3b52 100644 --- a/config/locales/javascript/javascript.bg.yml +++ b/config/locales/javascript/javascript.bg.yml @@ -9,16 +9,16 @@ bg: aspect_dropdown: add_to_aspect: "Избиране на аспект(и)" all_aspects: "Във всеки аспект" - error: "Не е възможно започване на споделяне с {{name}}. Вероятно ги игнорирате?" + error: "Не е възможно започване на споделяне с <%= name %>. Вероятно ги игнорирате?" select_aspects: "Избиране на аспект(и)" - started_sharing_with: "Започнахте да споделяте с {{name}}!" - stopped_sharing_with: "Престанахте да споделяте с {{name}}." + started_sharing_with: "Започнахте да споделяте с <%= name %>!" + stopped_sharing_with: "Престанахте да споделяте с <%= name %>." toggle: - few: "В {{count}} аспекта" - many: "В {{count}} аспекта" - one: "В {{count}} аспект" - other: "В {{count}} аспекта" - two: "В {{count}} аспекта" + few: "В <%= count %> аспекта" + many: "В <%= count %> аспекта" + one: "В <%= count %> аспект" + other: "В <%= count %> аспекта" + two: "В <%= count %> аспекта" zero: "Избиране на аспект(и)" aspect_navigation: deselect_all: Никой @@ -32,7 +32,7 @@ bg: failed_to_post_message: "Съобщението не бе публикувано!" getting_started: alright_ill_wait: "Добре, ще изчакам." - hey: "Здравейте, {{name}}!" + hey: "Здравейте, <%= name %>!" no_tags: "Не следите нито една марка! Желаете ли да продължите въпреки това?" preparing_your_stream: "Вашият персонализиран поток се подготвя..." infinite_scroll: @@ -45,10 +45,10 @@ bg: public: "Публично - публикацията ще бъде видима за всеки, а съдържанието ѝ ще бъде налично за търсещите машини" reshares: duplicate: "Вече сте споделили публикацията!" - search_for: "Търсене за {{name}}" + search_for: "Търсене за <%= name %>" show_more: "покажи още" tags: - wasnt_that_interesting: "Е, вероятно марката #{{tagName}} не е чак толкова интересна..." + wasnt_that_interesting: "Е, вероятно марката #<%= tagName %> не е чак толкова интересна..." timeago: day: ден days: "%d дни" @@ -67,4 +67,4 @@ bg: years: "%d години" videos: unknown: "Неизвестен вид видео" - watch: "Гледайте видеото в {{provider}}" \ No newline at end of file + watch: "Гледайте видеото в <%= provider %>" \ No newline at end of file diff --git a/config/locales/javascript/javascript.br.yml b/config/locales/javascript/javascript.br.yml index 10d75a891..96b5713b3 100644 --- a/config/locales/javascript/javascript.br.yml +++ b/config/locales/javascript/javascript.br.yml @@ -9,11 +9,11 @@ br: aspect_dropdown: add_to_aspect: "Add to aspect" toggle: - few: "In {{count}} aspects" - many: "In {{count}} aspects" - one: "In {{count}} aspect" - other: "In {{count}} aspects" - two: "In {{count}} aspects" + few: "In <%= count %> aspects" + many: "In <%= count %> aspects" + one: "In <%= count %> aspect" + other: "In <%= count %> aspects" + two: "In <%= count %> aspects" zero: "Add to aspect" confirm_dialog: "Emaoc'h sur?" getting_started: @@ -22,7 +22,7 @@ br: at_least_one_aspect: "Dav eo deoc'h embann un arvez da'n nebeutañ" reshares: duplicate: "You've already reshared that post!" - search_for: "Klask war-lerc'h {{name}}" + search_for: "Klask war-lerc'h <%= name %>" timeago: day: "un devezh" days: "%d a zevezhioù" @@ -39,4 +39,4 @@ br: years: "%d a vloavezhioù" videos: unknown: "Stumm ar video dianav" - watch: "Sellet ouzh ar video gant {{provider}}" \ No newline at end of file + watch: "Sellet ouzh ar video gant <%= provider %>" \ No newline at end of file diff --git a/config/locales/javascript/javascript.ca.yml b/config/locales/javascript/javascript.ca.yml index 557a1742f..0ed15e8c0 100644 --- a/config/locales/javascript/javascript.ca.yml +++ b/config/locales/javascript/javascript.ca.yml @@ -26,9 +26,9 @@ ca: year: "aproximadament un any" years: "%d anys" videos: - watch: "Visualitza aquest video a {{provider}}" + watch: "Visualitza aquest video a <%= provider %>" unknown: "El tipus de vídeo és desconegut" - search_for: "Cerca per {{name}}" + search_for: "Cerca per <%= name %>" publisher: at_least_one_aspect: "Heu de publicar en almenys un aspecte." limited: "Limitat - la vostra publicació només serà visible per a la gent amb qui esteu compartint" @@ -41,16 +41,16 @@ ca: add_to_aspect: "Afegeix el contacte" select_aspects: "Selecciona els aspectes" all_aspects: "Tots els aspectes" - stopped_sharing_with: "Heu deixat de compartir amb {{name}}." - started_sharing_with: "Heu començat a compartir amb {{name}}!" - error: "No s'ha pogut començar a compartir amb {{name}}. L'esteu ignorant?" + stopped_sharing_with: "Heu deixat de compartir amb <%= name %>." + started_sharing_with: "Heu començat a compartir amb <%= name %>!" + error: "No s'ha pogut començar a compartir amb <%= name %>. L'esteu ignorant?" toggle: zero: "Selecciona els aspectes" - one: "En {{count}} aspecte" - two: "En {{count}} aspectes" - few: "En {{count}} aspectes" - many: "En {{count}} aspectes" - other: "En {{count}} aspectes" + one: "En <%= count %> aspecte" + two: "En <%= count %> aspectes" + few: "En <%= count %> aspectes" + many: "En <%= count %> aspectes" + other: "En <%= count %> aspectes" show_more: "mostra'n més" failed_to_like: "No s'ha pogut comunicar que us agrada!" failed_to_post_message: "No s'ha pogut publicar el missatge!" @@ -64,11 +64,11 @@ ca: deselect_all: "Desselecciona'ls tots" no_aspects: "No heu seleccionat cap aspecte" getting_started: - hey: "Ei, {{name}}!" + hey: "Ei, <%= name %>!" no_tags: "Ei, no heu seguit cap etiqueta! Voleu continuar igualment?" alright_ill_wait: "D'acord, m'esperaré." preparing_your_stream: "S'està preparant el vostre flux personalitzat…" photo_uploader: looking_good: "Vaja, teniu un aspecte fantàstic!" tags: - wasnt_that_interesting: "D'acord, es possible que #{{tagName}} no fos tan interessant…" + wasnt_that_interesting: "D'acord, es possible que #<%= tagName %> no fos tan interessant…" diff --git a/config/locales/javascript/javascript.cs.yml b/config/locales/javascript/javascript.cs.yml index f0e6d13dd..be84c1d24 100644 --- a/config/locales/javascript/javascript.cs.yml +++ b/config/locales/javascript/javascript.cs.yml @@ -10,11 +10,11 @@ cs: add_to_aspect: "Přidat kontakt" all_aspects: "Všechny aspekty" toggle: - few: "Ve {{count}} aspektech" - many: "V {{count}} aspektech" - one: "V {{count}} aspektu" - other: "Ve {{count}} aspektech" - two: "Ve {{count}} aspektech" + few: "Ve <%= count %> aspektech" + many: "V <%= count %> aspektech" + one: "V <%= count %> aspektu" + other: "Ve <%= count %> aspektech" + two: "Ve <%= count %> aspektech" zero: "Vybrat aspekty" comments: hide: "skrýt komentáře" @@ -32,7 +32,7 @@ cs: public: "Veřejné - váši zprávu si bude moci přečíst kdokoliv a může být nalezena vyhledávači" reshares: duplicate: "Tato zprávu už sdílíte!" - search_for: "Hledat {{name}}" + search_for: "Hledat <%= name %>" show_more: "zobrazit více" timeago: day: "1 dnem" @@ -51,6 +51,6 @@ cs: years: "%d roky" videos: unknown: "Neznámý typ videa" - watch: "Podívejte se na tohle video na {{provider}}" + watch: "Podívejte se na tohle video na <%= provider %>" web_sockets: disconnected: "Websocket je uzavřen, příspěvky již nebude možno sledovat živě." \ No newline at end of file diff --git a/config/locales/javascript/javascript.cy.yml b/config/locales/javascript/javascript.cy.yml index d87c543c0..ade007522 100644 --- a/config/locales/javascript/javascript.cy.yml +++ b/config/locales/javascript/javascript.cy.yml @@ -10,14 +10,14 @@ cy: add_to_aspect: "Ychwanegu cysylltiad" all_aspects: "Agweddau i gŷd" select_aspects: "Dewis agweddau" - started_sharing_with: "Rydych chi'n rhannu gyda {{name}}!" - stopped_sharing_with: "Dydych chi ddim yn rhannu nawr gyda {{name}}." + started_sharing_with: "Rydych chi'n rhannu gyda <%= name %>!" + stopped_sharing_with: "Dydych chi ddim yn rhannu nawr gyda <%= name %>." toggle: - few: "Mewn {{count}} agweddau" - many: "Mewn {{count}} agweddau" - one: "Mewn {{count}} agwedd" - other: "Mewn {{count}} agweddau" - two: "Mewn {{count}} agweddau" + few: "Mewn <%= count %> agweddau" + many: "Mewn <%= count %> agweddau" + one: "Mewn <%= count %> agwedd" + other: "Mewn <%= count %> agweddau" + two: "Mewn <%= count %> agweddau" zero: "Dewiswch agweddau" aspect_navigation: deselect_all: "Dad-ddewis i gŷd" @@ -31,7 +31,7 @@ cy: failed_to_post_message: "Methwyd i bostio neges!" getting_started: alright_ill_wait: "O'r gorau - 'dwi'n aros..." - hey: "Hei, {{name}}!" + hey: "Hei, <%= name %>!" no_tags: "Hei, dydych chi ddim yn dilyn unrhyw tagiau! Dal ymlaen beth bynnag?" preparing_your_stream: "Preparing your personalised stream..." infinite_scroll: @@ -40,10 +40,10 @@ cy: looking_good: "OMG, rydych chi'n ymddangos yn neis iawn!" reshares: duplicate: "Mae hynny'n dda, eh? Rydych chi wedi rhannu'r bost eisoes!" - search_for: "Chwilio am {{name}}" + search_for: "Chwilio am <%= name %>" show_more: "dangos mwy" tags: - wasnt_that_interesting: "OK, mae'n debyg nid yw #{{tagName}} yn ddiddorol iawn..." + wasnt_that_interesting: "OK, mae'n debyg nid yw #<%= tagName %> yn ddiddorol iawn..." timeago: day: diwrnod days: "%d diwrnod" @@ -60,4 +60,4 @@ cy: years: "%d blyddynoedd" videos: unknown: "Math o fideo anhysbys" - watch: "Gwyliwch y fideo ar {{provider}}" \ No newline at end of file + watch: "Gwyliwch y fideo ar <%= provider %>" \ No newline at end of file diff --git a/config/locales/javascript/javascript.da.yml b/config/locales/javascript/javascript.da.yml index 210158891..8635c15cf 100644 --- a/config/locales/javascript/javascript.da.yml +++ b/config/locales/javascript/javascript.da.yml @@ -9,16 +9,16 @@ da: aspect_dropdown: add_to_aspect: "Tilføj kontakt" all_aspects: "Alle aspekter" - error: "Kunne ikke begynde at dele med {{name}}. Ignorerer du vedkommende?" + error: "Kunne ikke begynde at dele med <%= name %>. Ignorerer du vedkommende?" select_aspects: "Vælg aspekter" - started_sharing_with: "Du er begyndt at dele med {{name}}!" - stopped_sharing_with: "Du deler ikke længere med {{name}}." + started_sharing_with: "Du er begyndt at dele med <%= name %>!" + stopped_sharing_with: "Du deler ikke længere med <%= name %>." toggle: - few: "I {{count}} aspekter" - many: "I {{count}} aspekter" - one: "I {{count}} aspekt" - other: "I {{count}} aspekter" - two: "I {{count}} aspekter" + few: "I <%= count %> aspekter" + many: "I <%= count %> aspekter" + one: "I <%= count %> aspekt" + other: "I <%= count %> aspekter" + two: "I <%= count %> aspekter" zero: "Vælg aspekter" aspect_navigation: deselect_all: "Fravælg alle" @@ -32,7 +32,7 @@ da: failed_to_post_message: "Kunne ikke indsende besked!" getting_started: alright_ill_wait: "Okay, jeg venter." - hey: "Hej {{name}}!" + hey: "Hej <%= name %>!" no_tags: "Du har ikke fulgt nogen tags! Vil du fortsætte alligevel?" preparing_your_stream: "Forbereder din personlige strøm..." infinite_scroll: @@ -45,10 +45,10 @@ da: public: "Offentlig - dit indlæg vil være synligt for alle og kan findes af søgemaskiner" reshares: duplicate: "Du har allerede delt indlægget!" - search_for: "Søg efter {{name}}" + search_for: "Søg efter <%= name %>" show_more: "Vis mere" tags: - wasnt_that_interesting: "OK, jeg formoder #{{tagName}} ikke var så spændende igen..." + wasnt_that_interesting: "OK, jeg formoder #<%= tagName %> ikke var så spændende igen..." timeago: day: "en dag" days: "%d dage" @@ -67,6 +67,6 @@ da: years: "%d år" videos: unknown: "Ukendt videotype" - watch: "Se denne video på {{provider}}" + watch: "Se denne video på <%= provider %>" web_sockets: disconnected: "Forbindelse er lukket; indlæg vil ikke længere blive opdateret live." \ No newline at end of file diff --git a/config/locales/javascript/javascript.de.yml b/config/locales/javascript/javascript.de.yml index f0073f290..d0592c474 100644 --- a/config/locales/javascript/javascript.de.yml +++ b/config/locales/javascript/javascript.de.yml @@ -9,16 +9,16 @@ de: aspect_dropdown: add_to_aspect: "Kontakt hinzufügen" all_aspects: "Alle Aspekte" - error: "Konnte nicht anfangen, mit {{name}} zu teilen. Ignorierst du sie/ihn?" + error: "Konnte nicht anfangen, mit <%= name %> zu teilen. Ignorierst du sie/ihn?" select_aspects: "Wähle Aspekte aus" - started_sharing_with: "Du hast angefangen, mit {{name}} zu teilen!" - stopped_sharing_with: "Du hast aufgehört, mit {{name}} zu teilen!" + started_sharing_with: "Du hast angefangen, mit <%= name %> zu teilen!" + stopped_sharing_with: "Du hast aufgehört, mit <%= name %> zu teilen!" toggle: - few: "In {{count}} Aspekten" - many: "In {{count}} Aspekten" + few: "In <%= count %> Aspekten" + many: "In <%= count %> Aspekten" one: "In einem Aspekt" - other: "In {{count}} Aspekten" - two: "In {{count}} Aspekten" + other: "In <%= count %> Aspekten" + two: "In <%= count %> Aspekten" zero: "Aspekt auswählen" aspect_navigation: deselect_all: "Auswahl aufheben" @@ -44,10 +44,10 @@ de: public: "Öffentlich - dein Beitrag ist für alle sichtbar und kann von Suchmaschinen gefunden werden" reshares: duplicate: "Du hast diesen Beitrag bereits weitergesagt!" - search_for: "Nach {{name}} suchen" + search_for: "Nach <%= name %> suchen" show_more: "Mehr zeigen" tags: - wasnt_that_interesting: "OK, ich nehme an, #{{tagName}} war nicht so interessant..." + wasnt_that_interesting: "OK, ich nehme an, #<%= tagName %> war nicht so interessant..." timeago: day: "einem Tag" days: "%d Tagen" @@ -66,6 +66,6 @@ de: years: "%d Jahren" videos: unknown: "Unbekanntes Videoformat" - watch: "Dieses Video auf {{provider}} ansehen" + watch: "Dieses Video auf <%= provider %> ansehen" web_sockets: disconnected: "Der Websocket ist geschlossen. Beiträge werden nicht länger in Echtzeit aktualisiert." \ No newline at end of file diff --git a/config/locales/javascript/javascript.de_formal.yml b/config/locales/javascript/javascript.de_formal.yml index 0afa35458..02ef14c90 100644 --- a/config/locales/javascript/javascript.de_formal.yml +++ b/config/locales/javascript/javascript.de_formal.yml @@ -10,14 +10,14 @@ de_formal: add_to_aspect: "Kontakt hinzufügen" all_aspects: "Alle Aspekte" select_aspects: "Wählen Sie Aspekte aus" - started_sharing_with: "Sie haben angefangen, mit {{name}} zu teilen!" - stopped_sharing_with: "Sie haben aufgehört, mit {{name}} zu teilen!" + started_sharing_with: "Sie haben angefangen, mit <%= name %> zu teilen!" + stopped_sharing_with: "Sie haben aufgehört, mit <%= name %> zu teilen!" toggle: - few: "In {{count}} Aspekten" - many: "In {{count}} Aspekten" + few: "In <%= count %> Aspekten" + many: "In <%= count %> Aspekten" one: "In einem Aspekt" - other: "In {{count}} Aspekten" - two: "In {{count}} Aspekten" + other: "In <%= count %> Aspekten" + two: "In <%= count %> Aspekten" zero: "Aspekt auswählen" aspect_navigation: deselect_all: "Auswahl aufheben" @@ -43,10 +43,10 @@ de_formal: public: "Öffentlich - Ihr Beitrag ist für alle sichtbar und kann von Suchmaschinen gefunden werden" reshares: duplicate: "Sie haben diesen Beitrag bereits weitergesagt!" - search_for: "Nach {{name}} suchen" + search_for: "Nach <%= name %> suchen" show_more: "Mehr zeigen" tags: - wasnt_that_interesting: "OK, ich nehme an, #{{tagName}} war nicht so interessant..." + wasnt_that_interesting: "OK, ich nehme an, #<%= tagName %> war nicht so interessant..." timeago: day: "einem Tag" days: "%d Tagen" @@ -65,6 +65,6 @@ de_formal: years: "%d Jahren" videos: unknown: "Unbekanntes Videoformat" - watch: "Dieses Video auf {{provider}} ansehen" + watch: "Dieses Video auf <%= provider %> ansehen" web_sockets: disconnected: "Der Websocket ist geschlossen. Beiträge werden nicht länger in Echtzeit aktualisiert." \ No newline at end of file diff --git a/config/locales/javascript/javascript.el.yml b/config/locales/javascript/javascript.el.yml index 23ffffa7f..93f59f64e 100644 --- a/config/locales/javascript/javascript.el.yml +++ b/config/locales/javascript/javascript.el.yml @@ -9,16 +9,16 @@ el: aspect_dropdown: add_to_aspect: "Προσθήκη επαφής" all_aspects: "Όλες οι πτυχές" - error: "Δεν μπορεί να ξεκινήσει ο διαμοιρασμός με το χρήστη {{name}}. Μήπως τον αγνοείτε;" + error: "Δεν μπορεί να ξεκινήσει ο διαμοιρασμός με το χρήστη <%= name %>. Μήπως τον αγνοείτε;" select_aspects: "Επιλογή πτυχών" - started_sharing_with: "Ξεκινήσατε να διαμοιράζεστε με τον χρήστη {{name}}!" - stopped_sharing_with: "Σταματήσατε να διαμοιράζεστε με τον χρήστη {{name}}." + started_sharing_with: "Ξεκινήσατε να διαμοιράζεστε με τον χρήστη <%= name %>!" + stopped_sharing_with: "Σταματήσατε να διαμοιράζεστε με τον χρήστη <%= name %>." toggle: - few: "Σε {{count}} πτυχές" - many: "Σε {{count}} πτυχές" - one: "Σε {{count}} πτυχή" - other: "Σε {{count}} πτυχές" - two: "Σε {{count}} πτυχές" + few: "Σε <%= count %> πτυχές" + many: "Σε <%= count %> πτυχές" + one: "Σε <%= count %> πτυχή" + other: "Σε <%= count %> πτυχές" + two: "Σε <%= count %> πτυχές" zero: "Επιλέξτε πτυχές" aspect_navigation: deselect_all: "Εξαίρεση όλων" @@ -32,7 +32,7 @@ el: failed_to_post_message: "Αποτυχία δημοσίευσης μηνύματος!" getting_started: alright_ill_wait: "Εντάξει, θα περιμένω." - hey: "Γεια σου, {{name}}!" + hey: "Γεια σου, <%= name %>!" no_tags: "Γεια, δεν ακολουθείς ακόμα καμία ετικέτα! Συνεχίζουμε παρ' όλ' αυτά;" preparing_your_stream: "Ετοιμάζεται η προσωπική σας ροή..." infinite_scroll: @@ -45,10 +45,10 @@ el: public: "Δημόσιο - οι δημοσιεύσεις σας θα είναι ορατές στον καθένα και θα μπορούν να βρεθούν από τις μηχανές αναζήτησης." reshares: duplicate: "Αυτό είναι τόσο καλό ε; Έχετε ήδη κοινοποιήσει αυτή τη δημοσίευση!" - search_for: "Αναζήτηση για {{name}}" + search_for: "Αναζήτηση για <%= name %>" show_more: "Προβολή περισσότερων" tags: - wasnt_that_interesting: "OK, φαντάζομαι πως το #{{tagName}} δεν ήταν και τόσο ενδιαφέρον τελικά..." + wasnt_that_interesting: "OK, φαντάζομαι πως το #<%= tagName %> δεν ήταν και τόσο ενδιαφέρον τελικά..." timeago: day: "μία μέρα" days: "%d μέρες" @@ -65,6 +65,6 @@ el: years: "%d χρόνια" videos: unknown: "Άγνωστος τύπος βίντεο" - watch: "Δείτε το βίντεο στο {{provider}}" + watch: "Δείτε το βίντεο στο <%= provider %>" web_sockets: disconnected: "Το websocket είναι κλειστό: οι δημοσιεύσεις δεν θα αναμεταδίδονται ζωντανά πλέον." \ No newline at end of file diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml index 3497eba47..d0d086294 100644 --- a/config/locales/javascript/javascript.en.yml +++ b/config/locales/javascript/javascript.en.yml @@ -23,9 +23,9 @@ en: year: "about a year" years: "%d years" videos: - watch: "Watch this video on {{provider}}" + watch: "Watch this video on <%= provider %>" unknown: "Unknown video type" - search_for: "Search for {{name}}" + search_for: "Search for <%= name %>" publisher: at_least_one_aspect: "You must publish to at least one aspect" limited: "Limited - your post will only be seen by people you are sharing with" @@ -38,16 +38,16 @@ en: add_to_aspect: "Add contact" select_aspects: "Select aspects" all_aspects: "All aspects" - stopped_sharing_with: "You have stopped sharing with {{name}}." - started_sharing_with: "You have started sharing with {{name}}!" - error: "Couldn't start sharing with {{name}}. Are you ignoring them?" + stopped_sharing_with: "You have stopped sharing with <%= name %>." + started_sharing_with: "You have started sharing with <%= name %>!" + error: "Couldn't start sharing with <%= name %>. Are you ignoring them?" toggle: zero: "Select aspects" - one: "In {{count}} aspect" - two: "In {{count}} aspects" - few: "In {{count}} aspects" - many: "In {{count}} aspects" - other: "In {{count}} aspects" + one: "In <%= count %> aspect" + two: "In <%= count %> aspects" + few: "In <%= count %> aspects" + many: "In <%= count %> aspects" + other: "In <%= count %> aspects" show_more: "show more" failed_to_like: "Failed to like!" failed_to_post_message: "Failed to post message!" @@ -61,11 +61,11 @@ en: deselect_all: "Deselect all" no_aspects: "No aspects selected" getting_started: - hey: "Hey, {{name}}!" + hey: "Hey, <%= name %>!" no_tags: "Hey, you haven't followed any tags! Continue anyway?" alright_ill_wait: "Alright, I'll wait." preparing_your_stream: "Preparing your personalized stream..." photo_uploader: looking_good: "OMG, you look awesome!" tags: - wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..." + wasnt_that_interesting: "OK, I suppose #<%= tagName %> wasn't all that interesting..." diff --git a/config/locales/javascript/javascript.en_1337.yml b/config/locales/javascript/javascript.en_1337.yml index 4d31fd9c5..bf6906149 100644 --- a/config/locales/javascript/javascript.en_1337.yml +++ b/config/locales/javascript/javascript.en_1337.yml @@ -10,11 +10,11 @@ en_1337: add_to_aspect: "4DD N00B" all_aspects: "4LL 45P3C75" toggle: - few: "1N {{count}} 45P3C75" - many: "1N {{count}} 45P3C75" - one: "1N {{count}} 45P3C7" - other: "1N {{count}} 45P3C75" - two: "1N {{count}} 45P3C75" + few: "1N <%= count %> 45P3C75" + many: "1N <%= count %> 45P3C75" + one: "1N <%= count %> 45P3C7" + other: "1N <%= count %> 45P3C75" + two: "1N <%= count %> 45P3C75" zero: "4DD N00B" aspect_navigation: deselect_all: "D353L3C7 4LL" @@ -36,7 +36,7 @@ en_1337: public: "PUBL1C - Y0UR 5P4M W1LL B3 V151BL3 2 3V3RY0N3 4ND F0UND BY S34RCH 3NG1N35!" reshares: duplicate: "U H4V3 4LR34DY R35P4MM3D 7HI5!" - search_for: "S34RCH F0R {{name}}" + search_for: "S34RCH F0R <%= name %>" show_more: "5H0W M0R3!" timeago: day: "4 D4Y" @@ -54,6 +54,6 @@ en_1337: years: "%d Y34R5" videos: unknown: "UNK0WN V1D30 7YP3" - watch: "W47CH 7H15 V1D30 0N {{provider}}" + watch: "W47CH 7H15 V1D30 0N <%= provider %>" web_sockets: disconnected: D15C0NN3C73D! \ No newline at end of file diff --git a/config/locales/javascript/javascript.en_pirate.yml b/config/locales/javascript/javascript.en_pirate.yml index 6d8198ead..e8a4c117a 100644 --- a/config/locales/javascript/javascript.en_pirate.yml +++ b/config/locales/javascript/javascript.en_pirate.yml @@ -9,11 +9,11 @@ en_pirate: aspect_dropdown: add_to_aspect: "Add to aspect" toggle: - few: "In {{count}} aspects" - many: "In {{count}} aspects" - one: "In {{count}} aspect" - other: "In {{count}} aspects" - two: "In {{count}} aspects" + few: "In <%= count %> aspects" + many: "In <%= count %> aspects" + one: "In <%= count %> aspect" + other: "In <%= count %> aspects" + two: "In <%= count %> aspects" zero: "Add to aspect" getting_started: preparing_your_stream: "Preparing your personialized stream..." diff --git a/config/locales/javascript/javascript.en_shaw.yml b/config/locales/javascript/javascript.en_shaw.yml index ee5af1508..3106e50e6 100644 --- a/config/locales/javascript/javascript.en_shaw.yml +++ b/config/locales/javascript/javascript.en_shaw.yml @@ -9,11 +9,11 @@ en_shaw: aspect_dropdown: add_to_aspect: "𐑨𐑛 𐑑 𐑨𐑕𐑐𐑧𐑒𐑑" toggle: - few: "𐑦𐑯 {{count}} 𐑨𐑕𐑐𐑧𐑒𐑑𐑕" - many: "𐑦𐑯 {{count}} 𐑨𐑕𐑐𐑧𐑒𐑑𐑕" - one: "𐑦𐑯 {{count}} 𐑨𐑕𐑐𐑧𐑒𐑑" - other: "𐑦𐑯 {{count}} 𐑨𐑕𐑐𐑧𐑒𐑑𐑕" - two: "In {{count}} aspects" + few: "𐑦𐑯 <%= count %> 𐑨𐑕𐑐𐑧𐑒𐑑𐑕" + many: "𐑦𐑯 <%= count %> 𐑨𐑕𐑐𐑧𐑒𐑑𐑕" + one: "𐑦𐑯 <%= count %> 𐑨𐑕𐑐𐑧𐑒𐑑" + other: "𐑦𐑯 <%= count %> 𐑨𐑕𐑐𐑧𐑒𐑑𐑕" + two: "In <%= count %> aspects" zero: "𐑨𐑛 𐑑 𐑨𐑕𐑐𐑧𐑒𐑑" comments: hide: "𐑣𐑲𐑛 𐑒𐑪𐑥𐑩𐑯𐑑𐑕" @@ -29,7 +29,7 @@ en_shaw: at_least_one_aspect: "𐑿 𐑥𐑳𐑕𐑑 𐑐𐑳𐑚𐑤𐑦𐑖 𐑑 𐑨𐑑 𐑤𐑰𐑕𐑑 𐑢𐑳𐑯 𐑨𐑕𐑐𐑧𐑒𐑑" reshares: duplicate: "𐑿𐑝 𐑷𐑤𐑮𐑧𐑛𐑦 𐑮𐑦𐑖𐑺𐑛 𐑞𐑨𐑑 𐑐𐑴𐑕𐑑!" - search_for: "𐑕𐑻𐑗 𐑓𐑹 {{name}}" + search_for: "𐑕𐑻𐑗 𐑓𐑹 <%= name %>" show_more: "𐑖𐑴 𐑥𐑹" timeago: day: "𐑩 𐑛𐑱" @@ -49,6 +49,6 @@ en_shaw: years: "%d 𐑘𐑽𐑟" videos: unknown: "𐑩𐑯𐑯𐑴𐑯 𐑝𐑦𐑛𐑦𐑴 𐑑𐑲𐑐" - watch: "𐑢𐑷𐑗 𐑞𐑦𐑕 𐑝𐑦𐑛𐑦𐑴 𐑪𐑯 {{provider}}" + watch: "𐑢𐑷𐑗 𐑞𐑦𐑕 𐑝𐑦𐑛𐑦𐑴 𐑪𐑯 <%= provider %>" web_sockets: disconnected: "𐑞 𐑢𐑧𐑚𐑕𐑪𐑒𐑩𐑑 𐑦𐑟 𐑒𐑤𐑴𐑟𐑛; 𐑐𐑴𐑕𐑑𐑕 𐑢𐑦𐑤 𐑯𐑴 𐑤𐑪𐑙𐑜𐑼 𐑚𐑰 𐑕𐑑𐑮𐑰𐑥𐑛 𐑤𐑲𐑝." \ No newline at end of file diff --git a/config/locales/javascript/javascript.eo.yml b/config/locales/javascript/javascript.eo.yml index 37b8f493b..548a1e084 100644 --- a/config/locales/javascript/javascript.eo.yml +++ b/config/locales/javascript/javascript.eo.yml @@ -9,16 +9,16 @@ eo: aspect_dropdown: add_to_aspect: "Aldoni kontakton" all_aspects: "Ĉiuj aspektoj" - error: "Ne estis eble komunigi kun {{name}}. Ĉu vi ignoras ilin?" + error: "Ne estis eble komunigi kun <%= name %>. Ĉu vi ignoras ilin?" select_aspects: "Elekti aspektojn" - started_sharing_with: "Vi komencis komunigi kun {{name}}!" - stopped_sharing_with: "Vi ĉesis komunigi kun {{name}}." + started_sharing_with: "Vi komencis komunigi kun <%= name %>!" + stopped_sharing_with: "Vi ĉesis komunigi kun <%= name %>." toggle: - few: "En {{count}} aspektoj" - many: "En {{count}} aspektoj" - one: "En {{count}} aspekto" - other: "En {{count}} aspektoj" - two: "En {{count}} aspektoj" + few: "En <%= count %> aspektoj" + many: "En <%= count %> aspektoj" + one: "En <%= count %> aspekto" + other: "En <%= count %> aspektoj" + two: "En <%= count %> aspektoj" zero: "Elekti aspektojn" aspect_navigation: deselect_all: "Malselekti ĉiujn" @@ -32,7 +32,7 @@ eo: failed_to_post_message: "Ne povis afiŝi mesaĝon!" getting_started: alright_ill_wait: "En ordo, mi atendos." - hey: "Hej, {{name}}!" + hey: "Hej, <%= name %>!" no_tags: "Hej, vi ne sekvas iun etikedon! Ĉu tamen daŭrigi?" preparing_your_stream: "Preparante vian personan torenton..." infinite_scroll: @@ -45,10 +45,10 @@ eo: public: "Publika - via afiŝo vidoteblos de ĉiuj kaj trovotos de retserĉaplikaĵoj." reshares: duplicate: "Nu, ĉu tiel bone? Vi jam rekonigis tiun afiŝon!" - search_for: "Serĉi por {{name}}" + search_for: "Serĉi por <%= name %>" show_more: "vidi plu" tags: - wasnt_that_interesting: "Nu, mi supozas, ke #{{tagName}} ne estis tiel interese..." + wasnt_that_interesting: "Nu, mi supozas, ke #<%= tagName %> ne estis tiel interese..." timeago: day: "unu tago" days: "%d tagoj" @@ -67,6 +67,6 @@ eo: years: "%d jaroj" videos: unknown: "nekonata tipo de videaĵo" - watch: "Vidi tiun ĉi videon je {{provider}}" + watch: "Vidi tiun ĉi videon je <%= provider %>" web_sockets: disconnected: "La reta kontaktoskatolo estas fermita; afiŝoj ne plu rekte fluos." \ No newline at end of file diff --git a/config/locales/javascript/javascript.es-AR.yml b/config/locales/javascript/javascript.es-AR.yml index fcb5960bd..b14bbf066 100644 --- a/config/locales/javascript/javascript.es-AR.yml +++ b/config/locales/javascript/javascript.es-AR.yml @@ -9,16 +9,16 @@ es-AR: aspect_dropdown: add_to_aspect: "Agregar contacto" all_aspects: "Todos los aspectos" - error: "No se pudo empezar a compartir con {{name}}. ¿Será que lo/a estás ignorando?" + error: "No se pudo empezar a compartir con <%= name %>. ¿Será que lo/a estás ignorando?" select_aspects: "Selecciona aspectos" - started_sharing_with: "Empezaste a compartir con {{name}}!" - stopped_sharing_with: "Dejaste de compartir con {{name}}." + started_sharing_with: "Empezaste a compartir con <%= name %>!" + stopped_sharing_with: "Dejaste de compartir con <%= name %>." toggle: - few: "En {{count}} aspectos" - many: "En {{count}} aspectos" - one: "En {{count}} aspecto" - other: "En {{count}} aspectos" - two: "En {{count}} aspectos" + few: "En <%= count %> aspectos" + many: "En <%= count %> aspectos" + one: "En <%= count %> aspecto" + other: "En <%= count %> aspectos" + two: "En <%= count %> aspectos" zero: "Seleccionar aspectos" aspect_navigation: deselect_all: "De-seleccionar todo" @@ -32,7 +32,7 @@ es-AR: failed_to_post_message: "¡No pudo publicarse el mensaje!" getting_started: alright_ill_wait: "Todo bien, voy a esperar." - hey: "Che, {{name}}!" + hey: "Che, <%= name %>!" no_tags: "¡Che, no estás siguiendo ningún tag! ¿Continuar de todos modos?" preparing_your_stream: "Preparando tu stream personalizado..." infinite_scroll: @@ -45,10 +45,10 @@ es-AR: public: "Publica - tu publicación sera visible para cualquiera y los buscadores podrán encontrarla" reshares: duplicate: "¿Te gustó eh? ¡Ya habías compartido esa publicación!" - search_for: "Buscar a {{name}}" + search_for: "Buscar a <%= name %>" show_more: "mostrar más" tags: - wasnt_that_interesting: "OK, supongamos que #{{tagName}} no era tan interesante..." + wasnt_that_interesting: "OK, supongamos que #<%= tagName %> no era tan interesante..." timeago: day: "un día" days: "%d días" @@ -67,6 +67,6 @@ es-AR: years: "%d años" videos: unknown: "Tipo de video desconocido" - watch: "Ver este video en {{provider}}" + watch: "Ver este video en <%= provider %>" web_sockets: disconnected: "La conexión WebSocket está cerrada; las publicaciones ya no serán transmitidas en vivo." \ No newline at end of file diff --git a/config/locales/javascript/javascript.es.yml b/config/locales/javascript/javascript.es.yml index b1dd2b595..98af3ccb4 100644 --- a/config/locales/javascript/javascript.es.yml +++ b/config/locales/javascript/javascript.es.yml @@ -9,16 +9,16 @@ es: aspect_dropdown: add_to_aspect: "Añadir contacto" all_aspects: "Todos los aspectos" - error: "No podría empezar a compartir con {{name}}. ¿Vas a ignonarl@?" + error: "No podría empezar a compartir con <%= name %>. ¿Vas a ignonarl@?" select_aspects: "Elige los aspectos" - started_sharing_with: "¡Ahora sigues los mensajes públicos de {{name}}!" - stopped_sharing_with: "Ya no compartes más con {{name}}." + started_sharing_with: "¡Ahora sigues los mensajes públicos de <%= name %>!" + stopped_sharing_with: "Ya no compartes más con <%= name %>." toggle: - few: "En {{count}} aspectos" - many: "En {{count}} aspectos" - one: "En {{count}} aspecto" - other: "En {{count}} aspectos" - two: "En {{count}} aspectos" + few: "En <%= count %> aspectos" + many: "En <%= count %> aspectos" + one: "En <%= count %> aspecto" + other: "En <%= count %> aspectos" + two: "En <%= count %> aspectos" zero: "Elige los aspectos" aspect_navigation: deselect_all: "Desmarcar todos" @@ -32,7 +32,7 @@ es: failed_to_post_message: "¡Fallo al publicar el mensaje!" getting_started: alright_ill_wait: "Está bien, esperaré." - hey: "¡Hola, {{name}}!" + hey: "¡Hola, <%= name %>!" no_tags: "¡Eih, aún no sigues ninguna etiqueta! ¿Quieres continuar de todas formas?" preparing_your_stream: "Preparando tus novedades personalizadas..." infinite_scroll: @@ -45,10 +45,10 @@ es: public: "Público - tu publicación es visible para todos, incluyendo buscadores" reshares: duplicate: "Que bien, ¿eh? ¡Has compartido esa publicación!" - search_for: "Buscar a {{name}}" + search_for: "Buscar a <%= name %>" show_more: "mostrar más" tags: - wasnt_that_interesting: "OK, supongo que #{{tagName}} no era tan interesante..." + wasnt_that_interesting: "OK, supongo que #<%= tagName %> no era tan interesante..." timeago: day: "1 día" days: "%d días" @@ -67,6 +67,6 @@ es: years: "%d años" videos: unknown: "Tipo de video desconocido" - watch: "Ver este video con {{provider}}" + watch: "Ver este video con <%= provider %>" web_sockets: disconnected: "El canal está cerrado; las publicaciones no serán actualizadas al momento." \ No newline at end of file diff --git a/config/locales/javascript/javascript.eu.yml b/config/locales/javascript/javascript.eu.yml index 651a264ee..fd50b02c8 100644 --- a/config/locales/javascript/javascript.eu.yml +++ b/config/locales/javascript/javascript.eu.yml @@ -10,14 +10,14 @@ eu: add_to_aspect: "Adiskidea gehitu" all_aspects: "Alderdi guztiak" select_aspects: "Alderdiak aukeratu" - started_sharing_with: "{{name}}(r)ekin harremanetan hasi zara!" - stopped_sharing_with: "Jada ez zaude {{name}}(r)ekin harremanetan." + started_sharing_with: "<%= name %>(r)ekin harremanetan hasi zara!" + stopped_sharing_with: "Jada ez zaude <%= name %>(r)ekin harremanetan." toggle: - few: "{{count}} alderdietan" - many: "{{count}} alderdietan" - one: "Alderdi {{count}}ean" - other: "{{count}} alderdietan" - two: "{{count}} alderditan" + few: "<%= count %> alderdietan" + many: "<%= count %> alderdietan" + one: "Alderdi <%= count %>ean" + other: "<%= count %> alderdietan" + two: "<%= count %> alderditan" zero: "Alderdial hautatu" aspect_navigation: deselect_all: "Guztiak deshautatu" @@ -31,7 +31,7 @@ eu: failed_to_post_message: "Huts egin du mezuaren bidalketak!" getting_started: alright_ill_wait: "Beno, itxarongo dut." - hey: "Aizu, {{name}}!" + hey: "Aizu, <%= name %>!" no_tags: "Aizu, ez duzu etiketarik jarraitzen! Jarraitu hala ere?" preparing_your_stream: "Zure kronologia pertsonalizatua prestatzen..." infinite_scroll: @@ -44,10 +44,10 @@ eu: public: "Publikoa - zure mezua edonork ikusi ahalko du, bai eta bilaketa zerbitzuetan agertu ere" reshares: duplicate: "Oso ona, e? Dagoeneko birpartekatu duzu mezu hori!" - search_for: "Bilatu {{name}}" + search_for: "Bilatu <%= name %>" show_more: "erakutsi gehiago" tags: - wasnt_that_interesting: "Beno, suposatzen dut #{{tagName}} ez zela oso interesgarria..." + wasnt_that_interesting: "Beno, suposatzen dut #<%= tagName %> ez zela oso interesgarria..." timeago: day: "egun bat" days: "%d egun" @@ -65,6 +65,6 @@ eu: years: "%d urte" videos: unknown: "Bideo mota ezezaguna" - watch: "Ikusi bideo hau {{provider}}(e)n" + watch: "Ikusi bideo hau <%= provider %>(e)n" web_sockets: disconnected: "Websocketa itxita dago; mezuak ez dira denbora errealean azalduko." \ No newline at end of file diff --git a/config/locales/javascript/javascript.fi.yml b/config/locales/javascript/javascript.fi.yml index 635399e3a..465fe9450 100644 --- a/config/locales/javascript/javascript.fi.yml +++ b/config/locales/javascript/javascript.fi.yml @@ -9,16 +9,16 @@ fi: aspect_dropdown: add_to_aspect: "Lisää kontakti" all_aspects: "Kaikki näkymät" - error: "Ei voitu aloittaa jakamaan käyttäjän {{name}} kanssa. Oletko sivuuttanut hänet?" + error: "Ei voitu aloittaa jakamaan käyttäjän <%= name %> kanssa. Oletko sivuuttanut hänet?" select_aspects: "Valitse näkymät" - started_sharing_with: "Olet alkanut jakaa käyttäjän {{name}} kanssa!" - stopped_sharing_with: "Olet lopettanut jakamisen käyttäjän {{name}} kanssa." + started_sharing_with: "Olet alkanut jakaa käyttäjän <%= name %> kanssa!" + stopped_sharing_with: "Olet lopettanut jakamisen käyttäjän <%= name %> kanssa." toggle: - few: "{{count}} näkymässä" - many: "{{count}} näkymässä" - one: "{{count}} näkymässä" - other: "{{count}} näkymässä" - two: "{{count}} näkymässä" + few: "<%= count %> näkymässä" + many: "<%= count %> näkymässä" + one: "<%= count %> näkymässä" + other: "<%= count %> näkymässä" + two: "<%= count %> näkymässä" zero: "Valitse näkymät" aspect_navigation: deselect_all: "Poista valinnat" @@ -32,7 +32,7 @@ fi: failed_to_post_message: "Viestin lähetys epäonnistui!" getting_started: alright_ill_wait: "Okei, minä odotan." - hey: "Hei {{name}}!" + hey: "Hei <%= name %>!" no_tags: "Hei, et seuraa yhtäkään tagia! Jatketaanko silti?" preparing_your_stream: "Yksilöllistä virtaasi valmistellaan..." infinite_scroll: @@ -45,10 +45,10 @@ fi: public: "Julkinen - viestisi näkyvät kaikille mukaan lukien hakukoneet ja niiden tulokset" reshares: duplicate: "Olet jo uudelleenjakanut viesti!" - search_for: "Etsi nimellä {{name}}" + search_for: "Etsi nimellä <%= name %>" show_more: "näytä lisää" tags: - wasnt_that_interesting: "OK, #{{tagName}} ei tainnut ollakaan kovin kiinnostava aihe..." + wasnt_that_interesting: "OK, #<%= tagName %> ei tainnut ollakaan kovin kiinnostava aihe..." timeago: day: päivä days: "%d päivää" @@ -65,6 +65,6 @@ fi: years: "%d vuotta" videos: unknown: "Tuntematon videomuoto" - watch: "Katso video {{provider}} :ssa" + watch: "Katso video <%= provider %> :ssa" web_sockets: disconnected: "Yhteys on suljettu; viestejä ei enää esitetä reaaliaikaisesti." \ No newline at end of file diff --git a/config/locales/javascript/javascript.fr.yml b/config/locales/javascript/javascript.fr.yml index 89eb0cb5c..27b5c074d 100644 --- a/config/locales/javascript/javascript.fr.yml +++ b/config/locales/javascript/javascript.fr.yml @@ -9,16 +9,16 @@ fr: aspect_dropdown: add_to_aspect: "Ajouter le contact" all_aspects: "Tous les aspects" - error: "Impossible de partager avec {{name}}. Ignorez-vous cette personne ?" + error: "Impossible de partager avec <%= name %>. Ignorez-vous cette personne ?" select_aspects: "Choisir les aspects" - started_sharing_with: "Vous avez commencé à partager avec {{name}} !" - stopped_sharing_with: "Vous avez arrêté de partager avec {{name}}." + started_sharing_with: "Vous avez commencé à partager avec <%= name %> !" + stopped_sharing_with: "Vous avez arrêté de partager avec <%= name %>." toggle: - few: "Dans {{count}} aspects" - many: "Dans {{count}} aspects" - one: "Dans {{count}} aspect" - other: "Dans {{count}} aspects" - two: "Dans {{count}} aspects" + few: "Dans <%= count %> aspects" + many: "Dans <%= count %> aspects" + one: "Dans <%= count %> aspect" + other: "Dans <%= count %> aspects" + two: "Dans <%= count %> aspects" zero: "Sélectionnez les aspects" aspect_navigation: deselect_all: "Désélectionner tout" @@ -32,7 +32,7 @@ fr: failed_to_post_message: "Impossible de partager le message !" getting_started: alright_ill_wait: "Bon, je vais attendre." - hey: "Hey, {{name}} !" + hey: "Hey, <%= name %> !" no_tags: "Hey, vous ne suivez aucun tag ! Continuer quand même ?" preparing_your_stream: "Préparation de votre flux personnalisé..." infinite_scroll: @@ -45,10 +45,10 @@ fr: public: "Public - votre message sera visible de tous et trouvé par les moteurs de recherche" reshares: duplicate: "C'est si bien que ça ? Vous avez déjà repartagé ce message !" - search_for: "Chercher {{name}}" + search_for: "Chercher <%= name %>" show_more: "Voir plus" tags: - wasnt_that_interesting: "Ok, je suppose que #{{tagName}} n'est pas la seule chose qui vous intéresse..." + wasnt_that_interesting: "Ok, je suppose que #<%= tagName %> n'est pas la seule chose qui vous intéresse..." timeago: day: "environ un jour" days: "environ %d jours" @@ -67,6 +67,6 @@ fr: years: "%d ans" videos: unknown: "Type de vidéo inconnu" - watch: "Voir cette vidéo sur {{provider}}" + watch: "Voir cette vidéo sur <%= provider %>" web_sockets: disconnected: "Le WebSocket est fermé, les messages ne seront plus diffusés en direct." \ No newline at end of file diff --git a/config/locales/javascript/javascript.gl.yml b/config/locales/javascript/javascript.gl.yml index 4babce17a..aa438d056 100644 --- a/config/locales/javascript/javascript.gl.yml +++ b/config/locales/javascript/javascript.gl.yml @@ -9,10 +9,10 @@ gl: aspect_dropdown: add_to_aspect: "Engadir a un aspecto" toggle: - few: "En {{count}} aspectos" - many: "En {{count}} aspectos" + few: "En <%= count %> aspectos" + many: "En <%= count %> aspectos" one: "Nun aspecto" - other: "En {{count}} aspectos" + other: "En <%= count %> aspectos" zero: "Engadir a un aspecto" comments: hide: "Agochar os comentarios" @@ -24,7 +24,7 @@ gl: no_more: "Non hai máis publicacións." publisher: at_least_one_aspect: "Ten que publicalo polo menos nun aspecto." - search_for: "Buscar por «{{name}}»" + search_for: "Buscar por «<%= name %>»" show_more: "Amosar máis" timeago: day: "un día." @@ -44,6 +44,6 @@ gl: years: "%d anos." videos: unknown: "Tipo de vídeo descoñecido" - watch: "Ver o vídeo en {{provider}}" + watch: "Ver o vídeo en <%= provider %>" web_sockets: disconnected: "Pechouse o conector web, as publicacións deixarán de aparecer en canto se publiquen." \ No newline at end of file diff --git a/config/locales/javascript/javascript.he.yml b/config/locales/javascript/javascript.he.yml index 32ae0a9fd..4d0f63f28 100644 --- a/config/locales/javascript/javascript.he.yml +++ b/config/locales/javascript/javascript.he.yml @@ -14,11 +14,11 @@ he: started_sharing_with: "{{name}}! התחלת לשתף עם" stopped_sharing_with: "{{name}} הפסקת לשתף עם" toggle: - few: "{{count}} תחומי עניין ב" - many: "{{count}} תחומי עניין ב" - one: "{{count}}בתחום עניין " - other: "ב־{{count}} היבטים" - two: "ב־{{count}} היבטים" + few: "<%= count %> תחומי עניין ב" + many: "<%= count %> תחומי עניין ב" + one: "<%= count %> בתחום עניין " + other: "ב־<%= count %> היבטים" + two: "ב־<%= count %> היבטים" zero: "בחר תחום עניין" aspect_navigation: deselect_all: "בטל את הסימון" @@ -32,7 +32,7 @@ he: failed_to_post_message: "פרסום ההודעה נכשל!" getting_started: alright_ill_wait: "בסדר, אני אמתין." - hey: "שלום, {{name}}!" + hey: "שלום, <%= name %>!" no_tags: "?היי, לא עקבת אחרי אף תגית! לאן אתה רוצה להמשיך" preparing_your_stream: "החדשות האישיות שלך בשלבי הכנה" infinite_scroll: @@ -45,10 +45,10 @@ he: public: "ציבורי - הרשומה שלך תהיה גלויה לכולם וניתן יהיה למצוא אותה במנועי חיפוש" reshares: duplicate: "כבר שיתפת רשומה זו בעבר " - search_for: " {{name}}חיפוש אחר" + search_for: " <%= name %>חיפוש אחר" show_more: "הצגת עוד" tags: - wasnt_that_interesting: "...זה לא היה כל כך מעניין#{{tagName}} אוקיי, אני מניח " + wasnt_that_interesting: "...זה לא היה כל כך מעניין#<%= tagName %> אוקיי, אני מניח " timeago: day: יום days: "%d ימים" @@ -67,6 +67,6 @@ he: years: "%d שנים" videos: unknown: "סוג הווידאו אינו ידוע" - watch: " {{provider}}צפייה בסרטון וידאו זה באתר" + watch: " <%= provider %>צפייה בסרטון וידאו זה באתר" web_sockets: - disconnected: "צינור ההודעות סגור; הודעות לא יוצגו בזמן אמת" \ No newline at end of file + disconnected: "צינור ההודעות סגור; הודעות לא יוצגו בזמן אמת" diff --git a/config/locales/javascript/javascript.hu.yml b/config/locales/javascript/javascript.hu.yml index ad62e52a9..b7e283784 100644 --- a/config/locales/javascript/javascript.hu.yml +++ b/config/locales/javascript/javascript.hu.yml @@ -9,16 +9,16 @@ hu: aspect_dropdown: add_to_aspect: "Hozzáadás a csoporthoz" all_aspects: "Összes csoport" - error: "Nem indult el a megosztás vele: {{name}}. Visszavonod?" + error: "Nem indult el a megosztás vele: <%= name %>. Visszavonod?" select_aspects: "Csoportok kiválasztása" - started_sharing_with: "Mostantól megosztassz vele: {{name}}!" - stopped_sharing_with: "Nem osztassz meg többé vele: {{name}}." + started_sharing_with: "Mostantól megosztassz vele: <%= name %>!" + stopped_sharing_with: "Nem osztassz meg többé vele: <%= name %>." toggle: - few: "{{count}} csoportban" - many: "{{count}} csoportban" - one: "{{count}} csoportban" - other: "{{count}} csoportban" - two: "{{count}} csoportban" + few: "<%= count %> csoportban" + many: "<%= count %> csoportban" + one: "<%= count %> csoportban" + other: "<%= count %> csoportban" + two: "<%= count %> csoportban" zero: "Csoportok kiválasztása" aspect_navigation: deselect_all: "Összes kijelölés megszüntetése" @@ -32,7 +32,7 @@ hu: failed_to_post_message: "Üzenet elküldése sikertelen!" getting_started: alright_ill_wait: "Rendben, várok!" - hey: "Szia {{name}}!" + hey: "Szia <%= name %>!" no_tags: "Hékás, nem követtél egy #címkét sem! Így is folytatod?" preparing_your_stream: "Személyre szabott hírfolyamod előkészítése..." infinite_scroll: @@ -45,10 +45,10 @@ hu: public: "Nyilvános - ezt a bejegyzést bárki láthatja az interneten." reshares: duplicate: "Jó mi? De már egyszer megosztottad ezt a bejegyzést!" - search_for: "{{name}} keresése." + search_for: "<%= name %> keresése." show_more: tovább tags: - wasnt_that_interesting: "Oké, azt hiszem a #{{tagName}} nem volt annyira érdekes." + wasnt_that_interesting: "Oké, azt hiszem a #<%= tagName %> nem volt annyira érdekes." timeago: day: "egy nappal" days: "%d nappal" @@ -65,6 +65,6 @@ hu: years: "%d évvel" videos: unknown: "Ismeretlen videó tipus" - watch: "Videó megtekintése itt: {{provider}}" + watch: "Videó megtekintése itt: <%= provider %>" web_sockets: disconnected: "A websocket zárolva van. A bejegyzések nem lesznek előben stream-elve." \ No newline at end of file diff --git a/config/locales/javascript/javascript.id.yml b/config/locales/javascript/javascript.id.yml index 8656f5253..5e69536b5 100644 --- a/config/locales/javascript/javascript.id.yml +++ b/config/locales/javascript/javascript.id.yml @@ -9,11 +9,11 @@ id: aspect_dropdown: add_to_aspect: "Add to aspect" toggle: - few: "In {{count}} aspects" - many: "In {{count}} aspects" - one: "In {{count}} aspect" - other: "In {{count}} aspects" - two: "In {{count}} aspects" + few: "In <%= count %> aspects" + many: "In <%= count %> aspects" + one: "In <%= count %> aspect" + other: "In <%= count %> aspects" + two: "In <%= count %> aspects" zero: "Add to aspect" getting_started: preparing_your_stream: "Preparing your personialized stream..." diff --git a/config/locales/javascript/javascript.is.yml b/config/locales/javascript/javascript.is.yml index 1c5bbfa54..42a900e61 100644 --- a/config/locales/javascript/javascript.is.yml +++ b/config/locales/javascript/javascript.is.yml @@ -9,11 +9,11 @@ is: aspect_dropdown: add_to_aspect: "Add to aspect" toggle: - few: "In {{count}} aspects" - many: "In {{count}} aspects" - one: "In {{count}} aspect" - other: "In {{count}} aspects" - two: "In {{count}} aspects" + few: "In <%= count %> aspects" + many: "In <%= count %> aspects" + one: "In <%= count %> aspect" + other: "In <%= count %> aspects" + two: "In <%= count %> aspects" zero: "Add to aspect" confirm_dialog: "Ertu viss?" getting_started: @@ -35,4 +35,4 @@ is: years: "%d ára" videos: unknown: "Óþekkt vídeó tegund" - watch: "Horfa á þetta vídeó á {{provider}}" \ No newline at end of file + watch: "Horfa á þetta vídeó á <%= provider %>" \ No newline at end of file diff --git a/config/locales/javascript/javascript.it.yml b/config/locales/javascript/javascript.it.yml index 924687a50..cfbbde881 100644 --- a/config/locales/javascript/javascript.it.yml +++ b/config/locales/javascript/javascript.it.yml @@ -9,16 +9,16 @@ it: aspect_dropdown: add_to_aspect: Aggiungi all_aspects: "Tutti gli aspetti" - error: "Non è possibile condividere con {{name}}. E' tra gli utenti ignorati?" + error: "Non è possibile condividere con <%= name %>. E' tra gli utenti ignorati?" select_aspects: "Scegli gli aspetti" - started_sharing_with: "Hai iniziato a condividere con {{name}}!" - stopped_sharing_with: "Hai smesso di condividere con {{name}}." + started_sharing_with: "Hai iniziato a condividere con <%= name %>!" + stopped_sharing_with: "Hai smesso di condividere con <%= name %>." toggle: - few: "In {{count}} aspetti" - many: "In {{count}} aspetti" - one: "In {{count}} aspetto" - other: "In {{count}} aspetti" - two: "In {{count}} aspetti" + few: "In <%= count %> aspetti" + many: "In <%= count %> aspetti" + one: "In <%= count %> aspetto" + other: "In <%= count %> aspetti" + two: "In <%= count %> aspetti" zero: "Scegli gli aspetti" aspect_navigation: deselect_all: "Deseleziona tutti" @@ -32,7 +32,7 @@ it: failed_to_post_message: "Invio messaggio fallito!" getting_started: alright_ill_wait: "Perfetto, aspetterò." - hey: "Ciao, {{name}}!" + hey: "Ciao, <%= name %>!" no_tags: "Non hai scelto di seguire alcun tag, vuoi continuare comunque?" preparing_your_stream: "Sto preparando il tuo stream personalizzato..." infinite_scroll: @@ -45,10 +45,10 @@ it: public: "Pubblico - il tuo post sarà visibile a tutti, inclusi i motori di ricerca" reshares: duplicate: "Bello eh? Ma hai già condiviso quel post!" - search_for: "Ricerca per {{name}}" + search_for: "Ricerca per <%= name %>" show_more: continua... tags: - wasnt_that_interesting: "OK, immagino che #{{tagName}} non fosse così interessante..." + wasnt_that_interesting: "OK, immagino che #<%= tagName %> non fosse così interessante..." timeago: day: "un giorno" days: "%d giorni" @@ -66,6 +66,6 @@ it: years: "%d anni" videos: unknown: "Tipo di video sconosciuto" - watch: "Guarda questo video su {{provider}}" + watch: "Guarda questo video su <%= provider %>" web_sockets: disconnected: "Il websocket è chiuso; i post non saranno più aggiornati in tempo reale." \ No newline at end of file diff --git a/config/locales/javascript/javascript.ja.yml b/config/locales/javascript/javascript.ja.yml index 801da2034..7a4b70509 100644 --- a/config/locales/javascript/javascript.ja.yml +++ b/config/locales/javascript/javascript.ja.yml @@ -9,11 +9,11 @@ ja: aspect_dropdown: add_to_aspect: "Add to aspect" toggle: - few: "In {{count}} aspects" - many: "In {{count}} aspects" - one: "In {{count}} aspect" - other: "In {{count}} aspects" - two: "In {{count}} aspects" + few: "In <%= count %> aspects" + many: "In <%= count %> aspects" + one: "In <%= count %> aspect" + other: "In <%= count %> aspects" + two: "In <%= count %> aspects" zero: "Add to aspect" confirm_dialog: 本当にいいですか。 getting_started: @@ -24,7 +24,7 @@ ja: at_least_one_aspect: アスペクトを選択してから投稿してください。 reshares: duplicate: "You've already reshared that post!" - search_for: "{{name}}を検索する" + search_for: "<%= name %>を検索する" timeago: day: 1日 days: "%d日" @@ -42,6 +42,6 @@ ja: years: "%d年" videos: unknown: 動画の種類が不明です - watch: "{{provider}}で動画を視聴する" + watch: "<%= provider %>で動画を視聴する" web_sockets: disconnected: 接続が解除されました。投稿のリアルタイム更新を中断します。 \ No newline at end of file diff --git a/config/locales/javascript/javascript.ka.yml b/config/locales/javascript/javascript.ka.yml index 5a7da807a..0ce619fe4 100644 --- a/config/locales/javascript/javascript.ka.yml +++ b/config/locales/javascript/javascript.ka.yml @@ -9,16 +9,16 @@ ka: aspect_dropdown: add_to_aspect: "კონტაქტის დამატება" all_aspects: "ყველა ასპექტი" - error: "{{name}}-თან გაზიარების დაწყება ვერ მოხერხდა. იგნორირება ხომ არ გაუკეთეთ მას?" + error: "<%= name %>-თან გაზიარების დაწყება ვერ მოხერხდა. იგნორირება ხომ არ გაუკეთეთ მას?" select_aspects: "აირჩიეთ ასპექტები" - started_sharing_with: "თქვნ დაიწყეთ {{name}}-თან გაზიარება!" - stopped_sharing_with: "თქვენ შეწყვიტეთ {{name}}-თან გაზიარება." + started_sharing_with: "თქვნ დაიწყეთ <%= name %>-თან გაზიარება!" + stopped_sharing_with: "თქვენ შეწყვიტეთ <%= name %>-თან გაზიარება." toggle: - few: "{{count}} ასპექტში" - many: "{{count}} ასპექტში" - one: "{{count}} ასპექტში" - other: "{{count}} ასპექტში" - two: "{{count}} ასპექტში" + few: "<%= count %> ასპექტში" + many: "<%= count %> ასპექტში" + one: "<%= count %> ასპექტში" + other: "<%= count %> ასპექტში" + two: "<%= count %> ასპექტში" zero: "აირჩიეთ ასპექტები" aspect_navigation: deselect_all: "მონიშვნის მოხსნა" @@ -32,7 +32,7 @@ ka: failed_to_post_message: "შეტყობინების გამოცხადება ჩაიშალა!" getting_started: alright_ill_wait: "კარგი, მოვიცდი." - hey: "ჰეი, {{name}}!" + hey: "ჰეი, <%= name %>!" no_tags: "ჰეი, თქვენ არ მიყვებით არცერთ ტეგს! მაინც გსურთ გაგრძელება?" preparing_your_stream: "თქვენი პერსონალიზებული ნაკადი მზადდება..." infinite_scroll: @@ -45,10 +45,10 @@ ka: public: "საჯარო - თქვენს პოსტს დაინახავს ყველა და მას მოძებნილი იქნებიან საძიბო სისტემებით" reshares: duplicate: "ასეთი მაგარია? თქვენ უკვე გააზიარეთ ეს პოსტი!" - search_for: "ძებნა {{name}}" + search_for: "ძებნა <%= name %>" show_more: "მეტის ჩვენება" tags: - wasnt_that_interesting: "კარგი, მე ვფიქრობ რომ #{{tagName}} არც ისე საინტერესო იყო..." + wasnt_that_interesting: "კარგი, მე ვფიქრობ რომ #<%= tagName %> არც ისე საინტერესო იყო..." timeago: day: დღე days: "%d დღე" @@ -67,6 +67,6 @@ ka: years: "%d წელი" videos: unknown: "ვიდეოს ტიპი უცნობია" - watch: "ვიდეოს ნახვა საიტზე {{provider}}" + watch: "ვიდეოს ნახვა საიტზე <%= provider %>" web_sockets: disconnected: "ვებ-სოკეტი დახურულია; განხადებების ნაკადი აღარ მოედინება პირდაპირ." \ No newline at end of file diff --git a/config/locales/javascript/javascript.ko.yml b/config/locales/javascript/javascript.ko.yml index f7543a6cb..d742dc959 100644 --- a/config/locales/javascript/javascript.ko.yml +++ b/config/locales/javascript/javascript.ko.yml @@ -9,16 +9,16 @@ ko: aspect_dropdown: add_to_aspect: "애스펙에 넣기" all_aspects: "모든 에스팩" - error: "{{name}}님과 공유를 시작할 수 없습니다. 혹시 무시하고 있습니까?" + error: "<%= name %>님과 공유를 시작할 수 없습니다. 혹시 무시하고 있습니까?" select_aspects: "에스팩 선택" - started_sharing_with: "{{name}}님과의 공유를 시작합니다!" - stopped_sharing_with: "{{name}}님과의 공유를 멈췄습니다." + started_sharing_with: "<%= name %>님과의 공유를 시작합니다!" + stopped_sharing_with: "<%= name %>님과의 공유를 멈췄습니다." toggle: - few: "애스펙 {{count}}개 안에 있습니다" - many: "애스펙 {{count}}개 안에 있습니다" + few: "애스펙 <%= count %>개 안에 있습니다" + many: "애스펙 <%= count %>개 안에 있습니다" one: "애스펙 한 개 안에 있습니다" - other: "애스펙 {{count}}개 안에 있습니다" - two: "{{count}}개의 에스팩에서" + other: "애스펙 <%= count %>개 안에 있습니다" + two: "<%= count %>개의 에스팩에서" zero: "애스펙에 넣기" aspect_navigation: deselect_all: "선택 해제" @@ -31,7 +31,7 @@ ko: failed_to_like: "좋아요를 실패했습니다!" failed_to_post_message: "메시지 게시를 실패하였습니다!" getting_started: - hey: "{{name}}님 안녕하세요?" + hey: "<%= name %>님 안녕하세요?" no_tags: "태그를 팔로우하지 않았습니다. 그래도 계속하시겠습니까?" preparing_your_stream: "개인화 스트림 준비중···" infinite_scroll: @@ -44,10 +44,10 @@ ko: public: "공개 - 내 게시물을 누구나 볼 수 있고 검색 엔진으로 찾을 수 있습니다" reshares: duplicate: "이미 재공유된 게시물입니다!" - search_for: "{{name}} 검색" + search_for: "<%= name %> 검색" show_more: "더 보기" tags: - wasnt_that_interesting: "처리했습니다. #{{tagName}} 태그는 흥미롭지 않았군요?" + wasnt_that_interesting: "처리했습니다. #<%= tagName %> 태그는 흥미롭지 않았군요?" timeago: day: 하루 days: "%d일" @@ -65,6 +65,6 @@ ko: years: "%d년" videos: unknown: "알 수 없는 동영상 형식" - watch: "동영상을 {{provider}}에서 보기" + watch: "동영상을 <%= provider %>에서 보기" web_sockets: disconnected: "웹소켓이 닫혔습니다. 앞으로는 게시물이 실시간으로 제공되지 않습니다." \ No newline at end of file diff --git a/config/locales/javascript/javascript.ml.yml b/config/locales/javascript/javascript.ml.yml index ae68b7c87..7d7cf3f89 100644 --- a/config/locales/javascript/javascript.ml.yml +++ b/config/locales/javascript/javascript.ml.yml @@ -24,8 +24,8 @@ ml: years: "%d വര്‍ഷങ്ങള്‍ക്ക്" videos: unknown: "അജ്ഞാതമായ തരം വീഡിയോ" - watch: "ഈ വീഡിയോ {{provider}}ല്‍ കാണുക" - search_for: "{{name}}നായി തിരയുക" + watch: "ഈ വീഡിയോ <%= provider %>ല്‍ കാണുക" + search_for: "<%= name %>നായി തിരയുക" infinite_scroll: no_more: "കൂടുതല്‍ പോസ്റ്റുകളൊന്നുമില്ല." publisher: @@ -40,10 +40,10 @@ ml: add_to_aspect: "Add to aspect" toggle: zero: "Add to aspect" - one: "In {{count}} aspect" - few: "In {{count}} aspects" - many: "In {{count}} aspects" - other: "In {{count}} aspects" + one: "In <%= count %> aspect" + few: "In <%= count %> aspects" + many: "In <%= count %> aspects" + other: "In <%= count %> aspects" show_more: "show more" failed_to_like: "Failed to like!" failed_to_post_message: "Failed to post message!" diff --git a/config/locales/javascript/javascript.ms.yml b/config/locales/javascript/javascript.ms.yml index 7e34d682e..5c7349409 100644 --- a/config/locales/javascript/javascript.ms.yml +++ b/config/locales/javascript/javascript.ms.yml @@ -9,16 +9,16 @@ ms: aspect_dropdown: add_to_aspect: "Tambah kenalan" all_aspects: "Semua aspek" - error: "Tidak dapat berkongsi dengan {{name}}. Adakah anda mengabaikan mereka?" + error: "Tidak dapat berkongsi dengan <%= name %>. Adakah anda mengabaikan mereka?" select_aspects: "Pilih kenalan" - started_sharing_with: "Anda telah mula berkongsi dengan {{name}}!" - stopped_sharing_with: "Anda telah berhenti berkongsi dengan {{name}}." + started_sharing_with: "Anda telah mula berkongsi dengan <%= name %>!" + stopped_sharing_with: "Anda telah berhenti berkongsi dengan <%= name %>." toggle: - few: "Dalam {{count}} aspek" - many: "Dalam {{count}} aspek" - one: "Dalam {{count}} aspek" - other: "dalam {{count}} aspek" - two: "Dalam {{count}} aspek" + few: "Dalam <%= count %> aspek" + many: "Dalam <%= count %> aspek" + one: "Dalam <%= count %> aspek" + other: "dalam <%= count %> aspek" + two: "Dalam <%= count %> aspek" zero: "Pilih aspek" aspect_navigation: deselect_all: "menyahpilih semua" @@ -32,7 +32,7 @@ ms: failed_to_post_message: "Gagal untuk pos mesej!" getting_started: alright_ill_wait: "Baiklah, saya akan tunggu." - hey: "Hei, {{name}}!" + hey: "Hei, <%= name %>!" no_tags: "Hei, anda tidak mengikuti mana-mana tag! Teruskan juga?" preparing_your_stream: "Menyediakan strim peribadi anda..." infinite_scroll: @@ -45,10 +45,10 @@ ms: public: "Awam - Pos anda akan dilihat oleh semua orang dan dijumpai oleh enjin carian" reshares: duplicate: "Yang baik, kan? Anda telah berkongsi semula pos itu!" - search_for: "Mencari {{name}}" + search_for: "Mencari <%= name %>" show_more: "tunjuk lagi" tags: - wasnt_that_interesting: "OK, saya mengandaikan # {{tagName}} tidak semua yang menarik..." + wasnt_that_interesting: "OK, saya mengandaikan # <%= tagName %> tidak semua yang menarik..." timeago: day: sehari days: "%d hari" @@ -67,6 +67,6 @@ ms: years: "%d tahun" videos: unknown: "Jenis video tidak diketahui" - watch: "Tonton video ini di {{provider}}" + watch: "Tonton video ini di <%= provider %>" web_sockets: disconnected: "Websocket ditutup; pos tidak lagi akan distrim secara langsung." \ No newline at end of file diff --git a/config/locales/javascript/javascript.nb.yml b/config/locales/javascript/javascript.nb.yml index ce98d2027..f5efdd061 100644 --- a/config/locales/javascript/javascript.nb.yml +++ b/config/locales/javascript/javascript.nb.yml @@ -9,16 +9,16 @@ nb: aspect_dropdown: add_to_aspect: "Legg til kategori" all_aspects: "Alle kategorier" - error: "Kunne ikke begynne å dele med {{name}}. Ignorerer du dem?" + error: "Kunne ikke begynne å dele med <%= name %>. Ignorerer du dem?" select_aspects: "Velg kategori" - started_sharing_with: "Du har begynt å dele med {{name}}!" - stopped_sharing_with: "Du har sluttet å dele med {{name}}." + started_sharing_with: "Du har begynt å dele med <%= name %>!" + stopped_sharing_with: "Du har sluttet å dele med <%= name %>." toggle: - few: "I {{count}} kategorier" - many: "I {{count}} kategorier" - one: "I {{count}} kategori" - other: "I {{count}} kategorier" - two: "I {{count}} kategorier" + few: "I <%= count %> kategorier" + many: "I <%= count %> kategorier" + one: "I <%= count %> kategori" + other: "I <%= count %> kategorier" + two: "I <%= count %> kategorier" zero: "Legg til kategori" aspect_navigation: deselect_all: "Avmerk alle" @@ -32,7 +32,7 @@ nb: failed_to_post_message: "Klarte ikke å publisere post!" getting_started: alright_ill_wait: "Greit, jeg venter." - hey: "Hei, {{name}}!" + hey: "Hei, <%= name %>!" no_tags: "Hei, du har ikke fulgt noen tagger! Fortsett likevel?" preparing_your_stream: "Preparing your personialized stream..." infinite_scroll: @@ -45,10 +45,10 @@ nb: public: "Offentlig - posten din vil være synlig for alle og kan bli funnet av søkemotorer" reshares: duplicate: "du har allerede delt denne posten!" - search_for: "Søk etter {{name}}" + search_for: "Søk etter <%= name %>" show_more: "vis mer" tags: - wasnt_that_interesting: "OK, jeg skjønner at #{{tagName}} ikke var så spennende likevel..." + wasnt_that_interesting: "OK, jeg skjønner at #<%= tagName %> ikke var så spennende likevel..." timeago: day: "en dag" days: "%d dager" @@ -67,4 +67,4 @@ nb: years: "%d år" videos: unknown: "Ukjent videotype" - watch: "Se denne videoen på {{provider}}" \ No newline at end of file + watch: "Se denne videoen på <%= provider %>" \ No newline at end of file diff --git a/config/locales/javascript/javascript.nl.yml b/config/locales/javascript/javascript.nl.yml index 9e5015176..72919bf28 100644 --- a/config/locales/javascript/javascript.nl.yml +++ b/config/locales/javascript/javascript.nl.yml @@ -11,11 +11,11 @@ nl: all_aspects: "Alle aspecten" select_aspects: "Selecteer aspecten" toggle: - few: "In {{count}} aspecten" - many: "In {{count}} aspecten" - one: "In {{count}} aspect" - other: "In {{count}} aspecten" - two: "In {{count}} aspecten" + few: "In <%= count %> aspecten" + many: "In <%= count %> aspecten" + one: "In <%= count %> aspect" + other: "In <%= count %> aspecten" + two: "In <%= count %> aspecten" zero: "Voeg toe aan aspect" aspect_navigation: deselect_all: "Alles deselecteren" @@ -38,7 +38,7 @@ nl: public: "Openbaar - je post is zichtbaar voor iedereen en kan gevonden worden door zoekmachines" reshares: duplicate: "Je hebt deze post al doorgegeven!" - search_for: "Zoek naar {{name}}" + search_for: "Zoek naar <%= name %>" show_more: "laat meer zien" timeago: day: "een dag" @@ -56,6 +56,6 @@ nl: years: "%d jaar" videos: unknown: "Onbekend video type" - watch: "Bekijk deze video op {{provider}}" + watch: "Bekijk deze video op <%= provider %>" web_sockets: disconnected: "De websocket is gesloten; posts worden niet langer live gestreamd." \ No newline at end of file diff --git a/config/locales/javascript/javascript.nn.yml b/config/locales/javascript/javascript.nn.yml index 4dc7c5636..38817459b 100644 --- a/config/locales/javascript/javascript.nn.yml +++ b/config/locales/javascript/javascript.nn.yml @@ -9,16 +9,16 @@ nn: aspect_dropdown: add_to_aspect: "Legg til kontakt" all_aspects: "Alle aspekta" - error: "Klarte ikkje å byrja å dela med {{name}}. Ignorerer du dei?" + error: "Klarte ikkje å byrja å dela med <%= name %>. Ignorerer du dei?" select_aspects: "Vel aspekt" - started_sharing_with: "Du har byrja å dela med {{name}}." - stopped_sharing_with: "Du deler ikkje lenger med {{name}}." + started_sharing_with: "Du har byrja å dela med <%= name %>." + stopped_sharing_with: "Du deler ikkje lenger med <%= name %>." toggle: - few: "I {{count}} aspekt" - many: "I {{count}} aspekt" - one: "I {{count}} aspekt" - other: "I {{count}} aspekt" - two: "I {{count}} aspekt" + few: "I <%= count %> aspekt" + many: "I <%= count %> aspekt" + one: "I <%= count %> aspekt" + other: "I <%= count %> aspekt" + two: "I <%= count %> aspekt" zero: "Vel aspekt" aspect_navigation: deselect_all: "Vel vekk alle" @@ -32,7 +32,7 @@ nn: failed_to_post_message: "Klarte ikkje å senda meldinga." getting_started: alright_ill_wait: "Greitt, eg ventar." - hey: "Hei, {{name}}!" + hey: "Hei, <%= name %>!" no_tags: "Du har ikkje følgt nokon etikett. Vil du likevel halda fram?" preparing_your_stream: "Lagar den tilpassa straumen din …" infinite_scroll: @@ -45,10 +45,10 @@ nn: public: "Offentleg - alle kan sjå meldinga di og ho kan bli funnen av søkjemotorar" reshares: duplicate: "Så bra, altså? Men du har allereie delt meldinga :-)" - search_for: "Leit etter {{name}}" + search_for: "Leit etter <%= name %>" show_more: "syn meir" tags: - wasnt_that_interesting: "Greitt, #{{tagName}} var vel kanskje ikkje så interessant …" + wasnt_that_interesting: "Greitt, #<%= tagName %> var vel kanskje ikkje så interessant …" timeago: day: "om dagen" days: "%d dagar" @@ -65,6 +65,6 @@ nn: years: "%d år" videos: unknown: "Ukjend videotype" - watch: "Sjå denne videoen hos {{provider}}" + watch: "Sjå denne videoen hos <%= provider %>" web_sockets: disconnected: "Nettendepunktet er lukka - meldingane vil ikkje lenger kunna strøymast direkte." \ No newline at end of file diff --git a/config/locales/javascript/javascript.pl.yml b/config/locales/javascript/javascript.pl.yml index 231bea44b..e384d1902 100644 --- a/config/locales/javascript/javascript.pl.yml +++ b/config/locales/javascript/javascript.pl.yml @@ -9,16 +9,16 @@ pl: aspect_dropdown: add_to_aspect: "Dodaj kontakt" all_aspects: "Wszystkie aspekty" - error: "Nie można zacząć dzielić się z {{name}}. Może ich ignorujesz?" + error: "Nie można zacząć dzielić się z <%= name %>. Może ich ignorujesz?" select_aspects: "Wybierz aspekty" - started_sharing_with: "Od teraz dzielisz się z {{name}}!" - stopped_sharing_with: "Nie dzielisz się już z {{name}}." + started_sharing_with: "Od teraz dzielisz się z <%= name %>!" + stopped_sharing_with: "Nie dzielisz się już z <%= name %>." toggle: - few: "W {{count}} aspektach" - many: "W {{count}} aspektach" - one: "W {{count}} aspekcie" - other: "W {{count}} aspektach" - two: "W {{count}} aspektach" + few: "W <%= count %> aspektach" + many: "W <%= count %> aspektach" + one: "W <%= count %> aspekcie" + other: "W <%= count %> aspektach" + two: "W <%= count %> aspektach" zero: "Wybierz aspekty" aspect_navigation: deselect_all: "Odznacz wszystkie" @@ -32,7 +32,7 @@ pl: failed_to_post_message: "Nie można wysłać wiadomości!" getting_started: alright_ill_wait: "Dobrze, poczekam." - hey: "Hej, {{name}}!" + hey: "Hej, <%= name %>!" no_tags: "Hej, nie obserwujesz żadnych znaczników! Kontynuować mimo to?" preparing_your_stream: "Przygotowanie spersonalizowanego strumienia..." infinite_scroll: @@ -45,10 +45,10 @@ pl: public: "Publiczny - wpis będzie widoczny dla wszystkich i można go znaleźć przez wyszukiwarki" reshares: duplicate: "Już przekaza@{m:łeś|f:łaś|n:no} dalej ten wpis!" - search_for: "Znajdź: {{name}}" + search_for: "Znajdź: <%= name %>" show_more: "wyświetl więcej" tags: - wasnt_that_interesting: "OK, przypuszczam, że #{{tagName}} nie był, aż tak interesujący..." + wasnt_that_interesting: "OK, przypuszczam, że #<%= tagName %> nie był, aż tak interesujący..." timeago: day: dzień days: "%d dni" @@ -67,6 +67,6 @@ pl: years: "%d lat" videos: unknown: "Nieznany typ wideo" - watch: "Zobacz ten film na {{provider}}" + watch: "Zobacz ten film na <%= provider %>" web_sockets: disconnected: "Kanał komunikacji jest zamknięty; wpisy nie będą publikowane online." \ No newline at end of file diff --git a/config/locales/javascript/javascript.pt-BR.yml b/config/locales/javascript/javascript.pt-BR.yml index cb25a9202..cc0cccf38 100644 --- a/config/locales/javascript/javascript.pt-BR.yml +++ b/config/locales/javascript/javascript.pt-BR.yml @@ -9,16 +9,16 @@ pt-BR: aspect_dropdown: add_to_aspect: "Adicionar contato" all_aspects: "Todos aspectos" - error: "Não foi possível compartilhar com {{name}}. Deseja ignorar isto?" + error: "Não foi possível compartilhar com <%= name %>. Deseja ignorar isto?" select_aspects: "Selecione os aspectos" - started_sharing_with: "Você começou a compartilhar com {{name}}!" - stopped_sharing_with: "Você parou de compartilhar com {{name}}." + started_sharing_with: "Você começou a compartilhar com <%= name %>!" + stopped_sharing_with: "Você parou de compartilhar com <%= name %>." toggle: - few: "Em {{count}} aspectos" - many: "Em {{count}} aspectos" - one: "Em {{count}} aspecto" - other: "Em {{count}} aspectos" - two: "Em {{count}} aspectos" + few: "Em <%= count %> aspectos" + many: "Em <%= count %> aspectos" + one: "Em <%= count %> aspecto" + other: "Em <%= count %> aspectos" + two: "Em <%= count %> aspectos" zero: "Adicione para aspecto" aspect_navigation: deselect_all: "Desmarcar tudo" @@ -32,7 +32,7 @@ pt-BR: failed_to_post_message: "Falha em postar a mensagem!" getting_started: alright_ill_wait: "Tudo bem, eu esperarei." - hey: "Ei, {{name}}!" + hey: "Ei, <%= name %>!" no_tags: "Ei, você não está seguindo todas as tags! Continuar assim mesmo?" preparing_your_stream: "Preparando seu fluxo personalizado..." infinite_scroll: @@ -45,10 +45,10 @@ pt-BR: public: "Pública - a sua postagem será totalmente visível na web e poderá ser encontrada pelos mecanismos de buscas, Google, Bing e etc..." reshares: duplicate: "Você já compartilhou essa postagem." - search_for: "Procurar por {{name}}" + search_for: "Procurar por <%= name %>" show_more: "mostrar mais" tags: - wasnt_that_interesting: "Ok, eu acho que #{{tagName}} não era tão interessante..." + wasnt_that_interesting: "Ok, eu acho que #<%= tagName %> não era tão interessante..." timeago: day: "um dia" days: "%d dias" @@ -65,6 +65,6 @@ pt-BR: years: "%d anos" videos: unknown: "Tipo de vídeo desconhecido" - watch: "Assista este vídeo no {{provider}}" + watch: "Assista este vídeo no <%= provider %>" web_sockets: disconnected: "A conexão foi encerrada, não é mais possível transmitir novas postagens." \ No newline at end of file diff --git a/config/locales/javascript/javascript.pt-PT.yml b/config/locales/javascript/javascript.pt-PT.yml index 15f3d3a9d..66aa51468 100644 --- a/config/locales/javascript/javascript.pt-PT.yml +++ b/config/locales/javascript/javascript.pt-PT.yml @@ -9,16 +9,16 @@ pt-PT: aspect_dropdown: add_to_aspect: "Adicionar contacto" all_aspects: "Todos os aspectos" - error: "Não foi possível começar a partilhar com {{name}}. Você está a ignorá-los?" + error: "Não foi possível começar a partilhar com <%= name %>. Você está a ignorá-los?" select_aspects: "Seleccionar aspectos" - started_sharing_with: "Começou a partilhar com {{name}}!" - stopped_sharing_with: "Deixou de partilhar com {{name}}." + started_sharing_with: "Começou a partilhar com <%= name %>!" + stopped_sharing_with: "Deixou de partilhar com <%= name %>." toggle: - few: "Em {{count}} aspectos" - many: "Em {{count}} aspectos" - one: "Em {{count}} aspecto" - other: "Em {{count}} aspectos" - two: "Em {{count}} aspectos" + few: "Em <%= count %> aspectos" + many: "Em <%= count %> aspectos" + one: "Em <%= count %> aspecto" + other: "Em <%= count %> aspectos" + two: "Em <%= count %> aspectos" zero: "Seleccione os aspectos" aspect_navigation: deselect_all: "Desmarcar todos" @@ -32,7 +32,7 @@ pt-PT: failed_to_post_message: "Falhou ao publicar a mensagem!" getting_started: alright_ill_wait: "Tudo bem, eu esperarei." - hey: "Ei, {{name}}!" + hey: "Ei, <%= name %>!" no_tags: "Ei, não está a seguir nenhuma etiqueta! Continuar mesmo assim?" preparing_your_stream: "A preparar o seu Stream personalizado..." infinite_scroll: @@ -45,10 +45,10 @@ pt-PT: public: "Público - A sua publicação será visível para todos e encontrada por motores de busca" reshares: duplicate: "Que bom, hein? Você já republicou essa mensagem!" - search_for: "Procurar por {{name}}" + search_for: "Procurar por <%= name %>" show_more: "mostrar mais" tags: - wasnt_that_interesting: "OK, suponho que #{{tagName}} não era assim tão interessante..." + wasnt_that_interesting: "OK, suponho que #<%= tagName %> não era assim tão interessante..." timeago: day: "um dia" days: "%d dias" @@ -67,6 +67,6 @@ pt-PT: years: "%d anos" videos: unknown: "Formato de vídeo desconhecido" - watch: "Visualize este vídeo no {{provider}}" + watch: "Visualize este vídeo no <%= provider %>" web_sockets: disconnected: "A websocket está fechada; as publicações não serão distribuídas em directo." \ No newline at end of file diff --git a/config/locales/javascript/javascript.ro.yml b/config/locales/javascript/javascript.ro.yml index c2e9ec81a..31114e55a 100644 --- a/config/locales/javascript/javascript.ro.yml +++ b/config/locales/javascript/javascript.ro.yml @@ -9,16 +9,16 @@ ro: aspect_dropdown: add_to_aspect: "Adaugă la contacte" all_aspects: "Toate aspectele" - error: "Nu sa putut incepe impartirea de publicatii cu {{name}}. Ii ignorati cumva ?" + error: "Nu sa putut incepe impartirea de publicatii cu <%= name %>. Ii ignorati cumva ?" select_aspects: "Selectează aspecte" - started_sharing_with: "Ati inceput sa impartiti publicatii cu {{name}}!" - stopped_sharing_with: "Nu mai imparti publicatii cu {{name}}." + started_sharing_with: "Ati inceput sa impartiti publicatii cu <%= name %>!" + stopped_sharing_with: "Nu mai imparti publicatii cu <%= name %>." toggle: - few: "În {{count}} aspecte" - many: "În {{count}} aspecte" - one: "În {{count}} aspect" - other: "În {{count}} aspecte" - two: "In {{count}} aspecte" + few: "În <%= count %> aspecte" + many: "În <%= count %> aspecte" + one: "În <%= count %> aspect" + other: "În <%= count %> aspecte" + two: "In <%= count %> aspecte" zero: "Selectati aspecte" aspect_navigation: deselect_all: "Deselectează tot" @@ -32,7 +32,7 @@ ro: failed_to_post_message: "Nu sa reusit trimiterea mesajului!" getting_started: alright_ill_wait: "In regulă, o să aștept." - hey: "Salutare, {{name}}!" + hey: "Salutare, <%= name %>!" no_tags: "Hopa, nu urmati nicio eticheta! Continuati si asa ?" preparing_your_stream: "Se pregateste fluxul personalizat pentru dvs..." infinite_scroll: @@ -44,10 +44,10 @@ ro: limited: "Limitat - publicatia va fi vazuta doar de catre persoanele cu care imparti publicatii" reshares: duplicate: "E chiar asa de tare, hmm? Ati mai raspandit o data aceasta publicatie!" - search_for: "Caută {{name}}" + search_for: "Caută <%= name %>" show_more: "arată mai mult" tags: - wasnt_that_interesting: "Bine, presupun ca #{{tagName}} nu a fost chiar atat de interesant..." + wasnt_that_interesting: "Bine, presupun ca #<%= tagName %> nu a fost chiar atat de interesant..." timeago: day: "o zi" days: "%d zile" @@ -66,6 +66,6 @@ ro: years: "%d ani" videos: unknown: "Format de video necunoscut" - watch: "Vizualizează acest video pe {{provider}}" + watch: "Vizualizează acest video pe <%= provider %>" web_sockets: disconnected: "Websocket-ul e închis; posturile nu vor mai fi transmise în direct." \ No newline at end of file diff --git a/config/locales/javascript/javascript.ru.yml b/config/locales/javascript/javascript.ru.yml index f724bc75a..110da0cb6 100644 --- a/config/locales/javascript/javascript.ru.yml +++ b/config/locales/javascript/javascript.ru.yml @@ -9,16 +9,16 @@ ru: aspect_dropdown: add_to_aspect: "Добавить контакт" all_aspects: "Все аспекты" - error: "Невозможно начать делиться с пользователем {{name}}. Возможно, вы его заблокировали?" + error: "Невозможно начать делиться с пользователем <%= name %>. Возможно, вы его заблокировали?" select_aspects: "Выбрать аспекты" - started_sharing_with: "Вы начали делиться с {{name}}!" - stopped_sharing_with: "Вы перестали делиться с {{name}}." + started_sharing_with: "Вы начали делиться с <%= name %>!" + stopped_sharing_with: "Вы перестали делиться с <%= name %>." toggle: - few: "В {{count}} аспектах" - many: "В {{count}} аспектах" - one: "В {{count}} аспекте" - other: "В {{count}} аспектах" - two: "В {{count}} аспектах" + few: "В <%= count %> аспектах" + many: "В <%= count %> аспектах" + one: "В <%= count %> аспекте" + other: "В <%= count %> аспектах" + two: "В <%= count %> аспектах" zero: "Выбрать аспекты" aspect_navigation: deselect_all: "Выключить все" @@ -32,7 +32,7 @@ ru: failed_to_post_message: "Не удалось отправить сообщение!" getting_started: alright_ill_wait: "Хорошо, я подожду." - hey: "Привет, {{name}}!" + hey: "Привет, <%= name %>!" no_tags: "Вы не следите ни за одной меткой! Все равно продолжить?" preparing_your_stream: "Подготовка вашего личного потока..." infinite_scroll: @@ -45,10 +45,10 @@ ru: public: "Публичная - ваша запись будет видна всем, включая поисковые системы" reshares: duplicate: "Настолько круто, да? Вы уже поделились этой записью!" - search_for: "Искать {{name}}" + search_for: "Искать <%= name %>" show_more: "показать больше" tags: - wasnt_that_interesting: "Что ж, видимо, метка #{{tagName}} была не такой уж интересной..." + wasnt_that_interesting: "Что ж, видимо, метка #<%= tagName %> была не такой уж интересной..." timeago: day: день days: "%d дней[-я]" @@ -66,6 +66,6 @@ ru: years: "%d лет" videos: unknown: "Неизвестный видеоформат" - watch: "Смотреть это видео на {{provider}}" + watch: "Смотреть это видео на <%= provider %>" web_sockets: disconnected: "WebSocket закрыт; сообщения больше не будут транслироваться в прямом эфире." \ No newline at end of file diff --git a/config/locales/javascript/javascript.sk.yml b/config/locales/javascript/javascript.sk.yml index 8f8714995..b05e1c7ac 100644 --- a/config/locales/javascript/javascript.sk.yml +++ b/config/locales/javascript/javascript.sk.yml @@ -9,16 +9,16 @@ sk: aspect_dropdown: add_to_aspect: "Pridať kontakt" all_aspects: "Všetky kategórie" - error: "Nemôžete sa začať deliť s použ. {{name}}. Neignorujete ho (ju)?" + error: "Nemôžete sa začať deliť s použ. <%= name %>. Neignorujete ho (ju)?" select_aspects: "Vyberte si kategórie" - started_sharing_with: "Začali ste sa deliť s použ. {{name}}!" - stopped_sharing_with: "Prestali ste sa deliť s použ. {{name}}." + started_sharing_with: "Začali ste sa deliť s použ. <%= name %>!" + stopped_sharing_with: "Prestali ste sa deliť s použ. <%= name %>." toggle: - few: "V(o) {{count}} kategóriách" - many: "V(o) {{count}} kategóriách" - one: "V {{count}} kategórii" - other: "V(o) {{count}} kategóriách" - two: "V(o) {{count}} kategóriách" + few: "V(o) <%= count %> kategóriách" + many: "V(o) <%= count %> kategóriách" + one: "V <%= count %> kategórii" + other: "V(o) <%= count %> kategóriách" + two: "V(o) <%= count %> kategóriách" zero: "Vyberte si kategórie" aspect_navigation: deselect_all: "Odznačiť všetky" @@ -32,7 +32,7 @@ sk: failed_to_post_message: "Správu sa nepodarilo poslať!" getting_started: alright_ill_wait: "V poriadku, počkám." - hey: "Hej, {{name}}!" + hey: "Hej, <%= name %>!" no_tags: "Hej, nesledujete žiadne značky! Chcete aj tak pokračovať?" preparing_your_stream: "Pripravuje sa vaša upravená nástenka..." infinite_scroll: @@ -45,10 +45,10 @@ sk: public: "Verejný - váš príspevok pomocou vyhľadávačov uvidí a nájde každý" reshares: duplicate: "To je dobré, čo? Tento príspevok ste už raz znova zdieľali!" - search_for: "Hľadať {{name}}" + search_for: "Hľadať <%= name %>" show_more: "Zobraziť viac" tags: - wasnt_that_interesting: "Dobre, značka #{{tagName}} asi nebola veľmi zaujímavá..." + wasnt_that_interesting: "Dobre, značka #<%= tagName %> asi nebola veľmi zaujímavá..." timeago: day: včera days: "pred %d dňami" @@ -65,6 +65,6 @@ sk: years: "pred %d rokmi" videos: unknown: "Neznámy typ videa" - watch: "Pozrite sa na toto video na sieti {{provider}}" + watch: "Pozrite sa na toto video na sieti <%= provider %>" web_sockets: disconnected: "Webová zásuvka (websocket) je odpojená; príspevky sa už viac nebudú spracúvať v reálnom čase." \ No newline at end of file diff --git a/config/locales/javascript/javascript.sl.yml b/config/locales/javascript/javascript.sl.yml index 0433fb0d0..d0636238b 100644 --- a/config/locales/javascript/javascript.sl.yml +++ b/config/locales/javascript/javascript.sl.yml @@ -9,16 +9,16 @@ sl: aspect_dropdown: add_to_aspect: "Dodaj stik" all_aspects: "Vsi pogledi" - error: "Ne morem začeti deliti s {{name}}. Ali ste jih ignorirali?" + error: "Ne morem začeti deliti s <%= name %>. Ali ste jih ignorirali?" select_aspects: "Izberi poglede" - started_sharing_with: "Začeli ste deliti z {{name}}!" - stopped_sharing_with: "Prenehali ste deliti z {{name}}." + started_sharing_with: "Začeli ste deliti z <%= name %>!" + stopped_sharing_with: "Prenehali ste deliti z <%= name %>." toggle: - few: "V {{count}} pogledih" - many: "V {{count}} pogledih" - one: "V {{count}} pogledu" - other: "V {{count}} pogledih" - two: "V {{count}} pogledih" + few: "V <%= count %> pogledih" + many: "V <%= count %> pogledih" + one: "V <%= count %> pogledu" + other: "V <%= count %> pogledih" + two: "V <%= count %> pogledih" zero: "Izberi pogled" aspect_navigation: deselect_all: "Označi nič" @@ -32,7 +32,7 @@ sl: failed_to_post_message: "Objava ni uspela!" getting_started: alright_ill_wait: "V redu, bom počakal." - hey: "Hej, {{name}}!" + hey: "Hej, <%= name %>!" no_tags: "Hej, niste sledili nobeni oznaki! Vseeno nadaljuj?" preparing_your_stream: "Pripravljanje vašega osebnega toka ..." infinite_scroll: @@ -45,10 +45,10 @@ sl: public: "Javno - Vaša objava bo vidna vsem, prikazana bo tudi v spletnih iskalnikih" reshares: duplicate: "To objavo ste že ponovno delili" - search_for: "Išči {{name}}" + search_for: "Išči <%= name %>" show_more: "pokaži več" tags: - wasnt_that_interesting: "Vredu, mislim, da zaznamek #{{tagName}} ni bil tako zanimiv ..." + wasnt_that_interesting: "Vredu, mislim, da zaznamek #<%= tagName %> ni bil tako zanimiv ..." timeago: day: včeraj days: "pred %d dnem" @@ -65,6 +65,6 @@ sl: years: "pred %d leti" videos: unknown: "Neznan tip videa" - watch: "Glej ta video na {{provider}}" + watch: "Glej ta video na <%= provider %>" web_sockets: disconnected: "Ta spletni vtič je zaprt; objave se ne bodo več prenašale v živo." \ No newline at end of file diff --git a/config/locales/javascript/javascript.sv.yml b/config/locales/javascript/javascript.sv.yml index 2a156b540..27c84bdcf 100644 --- a/config/locales/javascript/javascript.sv.yml +++ b/config/locales/javascript/javascript.sv.yml @@ -9,16 +9,16 @@ sv: aspect_dropdown: add_to_aspect: "Lägg till kontakt" all_aspects: "Alla aspekter" - error: "Det går inte att börja dela med {{name}}. Ignorerar du dem?" + error: "Det går inte att börja dela med <%= name %>. Ignorerar du dem?" select_aspects: "Välj aspekter" - started_sharing_with: "Du har börjat dela med {{name}}!" - stopped_sharing_with: "Du har slutat dela med {{name}}." + started_sharing_with: "Du har börjat dela med <%= name %>!" + stopped_sharing_with: "Du har slutat dela med <%= name %>." toggle: - few: "I {{count}} aspekter" - many: "I {{count}} aspekter" - one: "I {{count}} aspekt" - other: "I {{count}} aspekter" - two: "I {{count}} aspekter" + few: "I <%= count %> aspekter" + many: "I <%= count %> aspekter" + one: "I <%= count %> aspekt" + other: "I <%= count %> aspekter" + two: "I <%= count %> aspekter" zero: "Välj aspekter" aspect_navigation: deselect_all: "Visa ingen" @@ -32,7 +32,7 @@ sv: failed_to_post_message: "Misslyckades att posta meddelande!" getting_started: alright_ill_wait: "Okej, jag väntar." - hey: "Hej, {{name}}!" + hey: "Hej, <%= name %>!" no_tags: "Du, du följer ju inte några taggar! Vill du fortsätta ändå?" preparing_your_stream: "Förbereder din personliga ström..." infinite_scroll: @@ -45,10 +45,10 @@ sv: public: "Publikt - ditt inlägg visas för alla och i söktjänster" reshares: duplicate: "Du gillar detta va? Du har nämligen redan spridit detta inlägg vidare!" - search_for: "Sök efter {{name}}" + search_for: "Sök efter <%= name %>" show_more: "visa mer" tags: - wasnt_that_interesting: "OK, jag antar att #{{tagName}} inte var så intressant..." + wasnt_that_interesting: "OK, jag antar att #<%= tagName %> inte var så intressant..." timeago: day: "en dag" days: "%d dagar" @@ -67,6 +67,6 @@ sv: years: "%d år" videos: unknown: "Okänd videotyp" - watch: "Se den här videon på {{provider}}" + watch: "Se den här videon på <%= provider %>" web_sockets: disconnected: "WebSocketen är stängd; inlägg kommer inte längre att bli direktstreamade." \ No newline at end of file diff --git a/config/locales/javascript/javascript.te.yml b/config/locales/javascript/javascript.te.yml index c591b0dd4..0d1dc0a6c 100644 --- a/config/locales/javascript/javascript.te.yml +++ b/config/locales/javascript/javascript.te.yml @@ -8,11 +8,11 @@ te: javascripts: aspect_dropdown: toggle: - few: "In {{count}} aspects" - many: "In {{count}} aspects" - one: "In {{count}} aspect" - other: "In {{count}} aspects" - two: "In {{count}} aspects" + few: "In <%= count %> aspects" + many: "In <%= count %> aspects" + one: "In <%= count %> aspect" + other: "In <%= count %> aspects" + two: "In <%= count %> aspects" zero: "Select aspects" aspect_navigation: select_all: "అన్నిటినీ ఎంచుకో" @@ -20,12 +20,12 @@ te: hide: "వ్యాఖ్యలను దాచు" show: "అన్ని వ్యాఖ్యలను చూపించు" getting_started: - hey: "ఓయ్, {{name}}!" + hey: "ఓయ్, <%= name %>!" infinite_scroll: no_more: "ఇంక టపాలు లేవు." reshares: duplicate: "ఓహో, అది బాగుందా? ఆ టపాని మీరు ఇప్పటికే పంచుకున్నారు!" - search_for: "{{name}} కోసం వెతకండి" + search_for: "<%= name %> కోసం వెతకండి" show_more: "మరిన్ని చూపించు" timeago: day: "ఒక రోజు" @@ -42,4 +42,4 @@ te: year: "దాదాపు సంవత్సరం" years: "%d సంవత్సరాల" videos: - watch: "ఈ వీడియోని {{provider}}లో చూడండి" \ No newline at end of file + watch: "ఈ వీడియోని <%= provider %>లో చూడండి" \ No newline at end of file diff --git a/config/locales/javascript/javascript.tr.yml b/config/locales/javascript/javascript.tr.yml index 5a9d1ed19..3c3232578 100644 --- a/config/locales/javascript/javascript.tr.yml +++ b/config/locales/javascript/javascript.tr.yml @@ -11,14 +11,14 @@ tr: all_aspects: "Tüm yönler" error: "{{name}} ile paylaşım başlatılamadı. Onu yasaklamış olmayasınız?" select_aspects: "Yönleri seç" - started_sharing_with: "{{name}} sizinle paylaşıma başladı!" - stopped_sharing_with: "{{name}} sizinle paylaşımı durdurdu." + started_sharing_with: "<%= name %> sizinle paylaşıma başladı!" + stopped_sharing_with: "<%= name %> sizinle paylaşımı durdurdu." toggle: - few: "{{count}} yön" - many: "{{count}} yön" - one: "{{count}} yön" - other: "{{count}} yön" - two: "{{count}} yön" + few: "<%= count %> yön" + many: "<%= count %> yön" + one: "<%= count %> yön" + other: "<%= count %> yön" + two: "<%= count %> yön" zero: "Yön seç" aspect_navigation: deselect_all: "Tümünü kaldır" @@ -32,7 +32,7 @@ tr: failed_to_post_message: "Gönderi başarısız oldu!" getting_started: alright_ill_wait: "Tamam, ben bekleyeceğim." - hey: "Merhaba, {{name}}!" + hey: "Merhaba, <%= name %>!" no_tags: "Hey, hiç etiket takip etmiyorsunuz! Gerçekten devam etmek istiyor musun?" preparing_your_stream: "Kişiselleştirilmiş akışınız hazırlanıyor..." infinite_scroll: @@ -45,10 +45,10 @@ tr: public: "Genel - gönderi herkes tarafından görünür ve arama motorları tarafından bulunur olacak" reshares: duplicate: "Bu iyi, değil mi? Zaten bu gönderiyi tekrar paylaştın!" - search_for: "{{name}} Ara" + search_for: "<%= name %> Ara" show_more: "daha fazlasını göster" tags: - wasnt_that_interesting: "Tamam, benim #{{tagName}} o kadar da ilginç değil..." + wasnt_that_interesting: "Tamam, benim #<%= tagName %> o kadar da ilginç değil..." timeago: day: "1 gün" days: "%d gün" @@ -67,6 +67,6 @@ tr: years: "%d yıl" videos: unknown: "Bilinmeyen video tipi" - watch: "Bu videoyu {{provider}}'da izle" + watch: "Bu videoyu <%= provider %>'da izle" web_sockets: disconnected: "Websocket kapalı; gönderiler bundan sonra canlı akış olacak." \ No newline at end of file diff --git a/config/locales/javascript/javascript.uk.yml b/config/locales/javascript/javascript.uk.yml index b1e890c5e..b311a9325 100644 --- a/config/locales/javascript/javascript.uk.yml +++ b/config/locales/javascript/javascript.uk.yml @@ -9,16 +9,16 @@ uk: aspect_dropdown: add_to_aspect: "Додати контакт" all_aspects: "Усі аспекти" - error: "Неможливо почати ділитися з користувачем {{name}}. Можливо, ви його заблокували?" + error: "Неможливо почати ділитися з користувачем <%= name %>. Можливо, ви його заблокували?" select_aspects: "Вибрати аспекти" - started_sharing_with: "Ви почали ділитися з {{name}}!" - stopped_sharing_with: "Ви перестали ділитися з {{name}}." + started_sharing_with: "Ви почали ділитися з <%= name %>!" + stopped_sharing_with: "Ви перестали ділитися з <%= name %>." toggle: - few: "У {{count}} аспектах" - many: "У {{count}} аспектах" - one: "У {{count}} аспектах" - other: "У {{count}} аспектах" - two: "У {{count}} аспектах" + few: "У <%= count %> аспектах" + many: "У <%= count %> аспектах" + one: "У <%= count %> аспектах" + other: "У <%= count %> аспектах" + two: "У <%= count %> аспектах" zero: "Вибрати аспекти" aspect_navigation: deselect_all: "Відмінити всі" @@ -32,7 +32,7 @@ uk: failed_to_post_message: "Не вдалося відправити повідомлення!" getting_started: alright_ill_wait: "Добре, я почекаю." - hey: "Привіт, {{name}}!" + hey: "Привіт, <%= name %>!" no_tags: "Ви не стежите ні за однією міткою! Все одно продовжити?" preparing_your_stream: "Підготовка вашого особистого потоку..." infinite_scroll: @@ -45,10 +45,10 @@ uk: public: "Публічна - ваш запис буде видний усім, включаючи пошукові системи" reshares: duplicate: "Настільки круто, так? Ви вже поділилися цим записом!" - search_for: "Шукати {{name}}" + search_for: "Шукати <%= name %>" show_more: "показати більше" tags: - wasnt_that_interesting: "OK, мабуть, стежити за міткою #{{tagName}} було не так вже цікаво..." + wasnt_that_interesting: "OK, мабуть, стежити за міткою #<%= tagName %> було не так вже цікаво..." timeago: day: день days: "%d днів[-я]" @@ -67,6 +67,6 @@ uk: years: "%d років" videos: unknown: "Невідомий відеоформат" - watch: "Дивитися це відео на {{provider}}" + watch: "Дивитися це відео на <%= provider %>" web_sockets: disconnected: "WebSocket закритий; повідомлення більше не транслюватимуться в прямому ефірі." \ No newline at end of file diff --git a/config/locales/javascript/javascript.vi.yml b/config/locales/javascript/javascript.vi.yml index 7f75125b8..4250dc50a 100644 --- a/config/locales/javascript/javascript.vi.yml +++ b/config/locales/javascript/javascript.vi.yml @@ -9,16 +9,16 @@ vi: aspect_dropdown: add_to_aspect: "Thêm liên lạc" all_aspects: "Tất cả mối quan hệ" - error: "Không thể bắt đầu chia sẻ với {{name}}. Bạn có bỏ qua họ?" + error: "Không thể bắt đầu chia sẻ với <%= name %>. Bạn có bỏ qua họ?" select_aspects: "Chọn mối quan hệ" - started_sharing_with: "Bạn đã bắt đầu chia sẻ với {{name}}!" - stopped_sharing_with: "Bạn đã ngưng chia sẻ với {{name}}." + started_sharing_with: "Bạn đã bắt đầu chia sẻ với <%= name %>!" + stopped_sharing_with: "Bạn đã ngưng chia sẻ với <%= name %>." toggle: - few: "Trong {{count}} mối quan hệ" - many: "Trong {{count}} mối quan hệ" - one: "Trong {{count}} mối quan hệ" - other: "Trong {{count}} mối quan hệ" - two: "Trong {{count}} mối quan hệ" + few: "Trong <%= count %> mối quan hệ" + many: "Trong <%= count %> mối quan hệ" + one: "Trong <%= count %> mối quan hệ" + other: "Trong <%= count %> mối quan hệ" + two: "Trong <%= count %> mối quan hệ" zero: "Chọn mối quan hệ" aspect_navigation: deselect_all: "Bỏ chọn tất cả" @@ -31,7 +31,7 @@ vi: failed_to_post_message: "Đăng tin thất bại!" getting_started: alright_ill_wait: "Được rồi, tôi sẽ chờ." - hey: "Này, {{name}}!" + hey: "Này, <%= name %>!" no_tags: "Bạn chưa theo dõi thẻ nào cả! Tiếp tục?" preparing_your_stream: "Preparing your personialized stream..." photo_uploader: @@ -42,7 +42,7 @@ vi: public: "Công khai - tin của bạn được mọi người và máy tìm kiếm nhìn thấy" reshares: duplicate: "Bạn đã chia sẻ lại tin đó!" - search_for: "Tìm {{name}}" + search_for: "Tìm <%= name %>" show_more: "hiện thêm" timeago: day: "một ngày" @@ -60,4 +60,4 @@ vi: years: "%d năm" videos: unknown: "Chưa biết kiểu video" - watch: "Xem video này trên {{provider}}" \ No newline at end of file + watch: "Xem video này trên <%= provider %>" \ No newline at end of file diff --git a/config/locales/javascript/javascript.zh-CN.yml b/config/locales/javascript/javascript.zh-CN.yml index 1f83e4c22..075ac57b8 100644 --- a/config/locales/javascript/javascript.zh-CN.yml +++ b/config/locales/javascript/javascript.zh-CN.yml @@ -9,11 +9,11 @@ zh-CN: aspect_dropdown: add_to_aspect: 添加到视图 toggle: - few: "在{{count}}个视图中" - many: "在{{count}}个视图中" - one: "在{{count}}个视图中" - other: "在{{count}}个视图中" - two: "In {{count}} aspects" + few: "在<%= count %>个视图中" + many: "在<%= count %>个视图中" + one: "在<%= count %>个视图中" + other: "在<%= count %>个视图中" + two: "In <%= count %> aspects" zero: 添加到视图 comments: hide: 隐藏评论 @@ -29,7 +29,7 @@ zh-CN: at_least_one_aspect: 发布时请选择至少一个情景 reshares: duplicate: "You've already reshared that post!" - search_for: "搜索 {{name}}" + search_for: "搜索 <%= name %>" show_more: 查看更多 timeago: day: 1天 @@ -47,6 +47,6 @@ zh-CN: years: "%d年" videos: unknown: 未知视频格式 - watch: "在 {{provider}} 上看观看视频" + watch: "在 <%= provider %> 上看观看视频" web_sockets: disconnected: websocket已关闭,内容不会再实时更新。 \ No newline at end of file diff --git a/config/locales/javascript/javascript.zh-TW.yml b/config/locales/javascript/javascript.zh-TW.yml index cf891c33c..78e1dfb02 100644 --- a/config/locales/javascript/javascript.zh-TW.yml +++ b/config/locales/javascript/javascript.zh-TW.yml @@ -9,16 +9,16 @@ zh-TW: aspect_dropdown: add_to_aspect: 加聯絡人 all_aspects: 所有面向 - error: "無法開始和 {{name}} 分享. 你還在忽視他們嗎?" + error: "無法開始和 <%= name %> 分享. 你還在忽視他們嗎?" select_aspects: 選面向 - started_sharing_with: "你開始和 {{name}} 分享了!" - stopped_sharing_with: "你停止和 {{name}} 分享了." + started_sharing_with: "你開始和 <%= name %> 分享了!" + stopped_sharing_with: "你停止和 <%= name %> 分享了." toggle: - few: "在{{count}}個面向中" - many: "在{{count}}個面向中" - one: "在{{count}}個面向中" - other: "在{{count}}個面向中" - two: "在{{count}}個面向中" + few: "在<%= count %>個面向中" + many: "在<%= count %>個面向中" + one: "在<%= count %>個面向中" + other: "在<%= count %>個面向中" + two: "在<%= count %>個面向中" zero: 選面向 aspect_navigation: deselect_all: 全不選 @@ -32,7 +32,7 @@ zh-TW: failed_to_post_message: 貼文失敗! getting_started: alright_ill_wait: "好吧, 以後再說." - hey: "嘿, {{name}}!" + hey: "嘿, <%= name %>!" no_tags: "嘿, 你還沒有追蹤任何標籤! 要往下一步嗎?" preparing_your_stream: 整理你個人的流水帳中... infinite_scroll: @@ -45,10 +45,10 @@ zh-TW: public: "公開 - 所有人都能看到你的貼文, 包括搜尋引擎" reshares: duplicate: "很棒對吧? 你已經轉貼過該篇貼文了!" - search_for: "搜尋 {{name}}" + search_for: "搜尋 <%= name %>" show_more: 顯示更多 tags: - wasnt_that_interesting: "OK, 我想 #{{tagName}} 大概沒那麼有趣..." + wasnt_that_interesting: "OK, 我想 #<%= tagName %> 大概沒那麼有趣..." timeago: day: 一天 days: "%d天" @@ -67,6 +67,6 @@ zh-TW: years: "%d年" videos: unknown: 不明的影片類別 - watch: "從 {{provider}} 看這部影片" + watch: "從 <%= provider %> 看這部影片" web_sockets: disconnected: "Websocket 已斷線; 貼文不會再即時更新了." \ No newline at end of file diff --git a/public/javascripts/helpers/alert.js b/public/javascripts/helpers/alert.js index 769a8de18..08dd06dea 100644 --- a/public/javascripts/helpers/alert.js +++ b/public/javascripts/helpers/alert.js @@ -2,19 +2,19 @@ Diaspora.Alert = { faceboxTemplate: '
' + '
' + - '
' + - '

' + - '{{title}}' + - '

' + - '
' + - '{{content}}' + + '
' + + '

' + + '<%= title %>' + + '

' + + '
' + + '<%= content %>' + '
' + '
', show: function(title, content) { - $($.mustache(this.faceboxTemplate, { + $(_.template(this.faceboxTemplate, { title: title, - content: content + content: content })).appendTo(document.body); $.facebox({ @@ -27,4 +27,4 @@ $(function() { $(document).bind("close.facebox", function() { $("#diaspora_alert").remove(); }); -}); \ No newline at end of file +}); diff --git a/public/javascripts/helpers/i18n.js b/public/javascripts/helpers/i18n.js index fb8714c6c..d01db64f4 100644 --- a/public/javascripts/helpers/i18n.js +++ b/public/javascripts/helpers/i18n.js @@ -36,6 +36,6 @@ translatedMessage = translatedMessage[nextNamespace]; } - return $.mustache(translatedMessage, views || {}); + return _.template(translatedMessage, views || {}); } - }; \ No newline at end of file + }; diff --git a/public/javascripts/vendor/Mustache.js b/public/javascripts/vendor/Mustache.js deleted file mode 100644 index 1b6b85c81..000000000 --- a/public/javascripts/vendor/Mustache.js +++ /dev/null @@ -1,332 +0,0 @@ -/* - mustache.js — Logic-less templates in JavaScript - - See http://mustache.github.com/ for more info. - */ -(function() { - var Mustache = function() { - var Renderer = function() { - }; - - Renderer.prototype = { - otag: "{{", - ctag: "}}", - pragmas: {}, - buffer: [], - pragmas_implemented: { - "IMPLICIT-ITERATOR": true - }, - context: {}, - - render: function(template, context, partials, in_recursion) { - // reset buffer & set context - if (!in_recursion) { - this.context = context; - this.buffer = []; // TODO: make this non-lazy - } - - // fail fast - if (!this.includes("", template)) { - if (in_recursion) { - return template; - } else { - this.send(template); - return; - } - } - - template = this.render_pragmas(template); - var html = this.render_section(template, context, partials); - if (in_recursion) { - return this.render_tags(html, context, partials, in_recursion); - } - - this.render_tags(html, context, partials, in_recursion); - }, - - /* - Sends parsed lines - */ - send: function(line) { - if (line != "") { - this.buffer.push(line); - } - }, - - /* - Looks for %PRAGMAS - */ - render_pragmas: function(template) { - // no pragmas - if (!this.includes("%", template)) { - return template; - } - - var that = this; - var regex = new RegExp(this.otag + "%([\\w-]+) ?([\\w]+=[\\w]+)?" + - this.ctag); - return template.replace(regex, function(match, pragma, options) { - if (!that.pragmas_implemented[pragma]) { - throw({message: - "This implementation of mustache doesn't understand the '" + - pragma + "' pragma"}); - } - that.pragmas[pragma] = {}; - if (options) { - var opts = options.split("="); - that.pragmas[pragma][opts[0]] = opts[1]; - } - return ""; - // ignore unknown pragmas silently - }); - }, - - /* - Tries to find a partial in the curent scope and render it - */ - render_partial: function(name, context, partials) { - name = this.trim(name); - if (!partials || partials[name] === undefined) { - throw({message: "unknown_partial '" + name + "'"}); - } - if (typeof(context[name]) != "object") { - return this.render(partials[name], context, partials, true); - } - return this.render(partials[name], context[name], partials, true); - }, - - /* - Renders inverted (^) and normal (#) sections - */ - render_section: function(template, context, partials) { - if (!this.includes("#", template) && !this.includes("^", template)) { - return template; - } - - var that = this; - // CSW - Added "+?" so it finds the tighest bound, not the widest - var regex = new RegExp(this.otag + "(\\^|\\#)\\s*(.+)\\s*" + this.ctag + - "\n*([\\s\\S]+?)" + this.otag + "\\/\\s*\\2\\s*" + this.ctag + - "\\s*", "mg"); - - // for each {{#foo}}{{/foo}} section do... - return template.replace(regex, function(match, type, name, content) { - var value = that.find(name, context); - if (type == "^") { // inverted section - if (!value || that.is_array(value) && value.length === 0) { - // false or empty list, render it - return that.render(content, context, partials, true); - } else { - return ""; - } - } else if (type == "#") { // normal section - if (that.is_array(value)) { // Enumerable, Let's loop! - return that.map(value, - function(row) { - return that.render(content, that.create_context(row), - partials, true); - }).join(""); - } else if (that.is_object(value)) { // Object, Use it as subcontext! - return that.render(content, that.create_context(value), - partials, true); - } else if (typeof value === "function") { - // higher order section - return value.call(context, content, function(text) { - return that.render(text, context, partials, true); - }); - } else if (value) { // boolean section - return that.render(content, context, partials, true); - } else { - return ""; - } - } - }); - }, - - /* - Replace {{foo}} and friends with values from our view - */ - render_tags: function(template, context, partials, in_recursion) { - // tit for tat - var that = this; - - var new_regex = function() { - return new RegExp(that.otag + "(=|!|>|\\{|%)?([^\\/#\\^]+?)\\1?" + - that.ctag + "+", "g"); - }; - - var regex = new_regex(); - var tag_replace_callback = function(match, operator, name) { - switch (operator) { - case "!": // ignore comments - return ""; - case "=": // set new delimiters, rebuild the replace regexp - that.set_delimiters(name); - regex = new_regex(); - return ""; - case ">": // render partial - return that.render_partial(name, context, partials); - case "{": // the triple mustache is unescaped - return that.find(name, context); - default: // escape the value - return that.escape(that.find(name, context)); - } - }; - var lines = template.split("\n"); - for (var i = 0; i < lines.length; i++) { - lines[i] = lines[i].replace(regex, tag_replace_callback, this); - if (!in_recursion) { - this.send(lines[i]); - } - } - - if (in_recursion) { - return lines.join("\n"); - } - }, - - set_delimiters: function(delimiters) { - var dels = delimiters.split(" "); - this.otag = this.escape_regex(dels[0]); - this.ctag = this.escape_regex(dels[1]); - }, - - escape_regex: function(text) { - // thank you Simon Willison - if (!arguments.callee.sRE) { - var specials = [ - '/', '.', '*', '+', '?', '|', - '(', ')', '[', ']', '{', '}', '\\' - ]; - arguments.callee.sRE = new RegExp( - '(\\' + specials.join('|\\') + ')', 'g' - ); - } - return text.replace(arguments.callee.sRE, '\\$1'); - }, - - /* - find `name` in current `context`. That is find me a value - from the view object - */ - find: function(name, context) { - name = this.trim(name); - - // Checks whether a value is thruthy or false or 0 - function is_kinda_truthy(bool) { - return bool === false || bool === 0 || bool; - } - - var value; - if (is_kinda_truthy(context[name])) { - value = context[name]; - } else if (is_kinda_truthy(this.context[name])) { - value = this.context[name]; - } - - if (typeof value === "function") { - return value.apply(context); - } - if (value !== undefined) { - return value; - } - // silently ignore unkown variables - return ""; - }, - - // Utility methods - - /* includes tag */ - includes: function(needle, haystack) { - return haystack.indexOf(this.otag + needle) != -1; - }, - - /* - Does away with nasty characters - */ - escape: function(s) { - s = String(s === null ? "" : s); - return s.replace(/&(?!\w+;)|["'<>\\]/g, function(s) { - switch (s) { - case "&": return "&"; - case "\\": return "\\\\"; - case '"': return '"'; - case "'": return '''; - case "<": return "<"; - case ">": return ">"; - default: return s; - } - }); - }, - - // by @langalex, support for arrays of strings - create_context: function(_context) { - if (this.is_object(_context)) { - return _context; - } else { - var iterator = "."; - if (this.pragmas["IMPLICIT-ITERATOR"]) { - iterator = this.pragmas["IMPLICIT-ITERATOR"].iterator; - } - var ctx = {}; - ctx[iterator] = _context; - return ctx; - } - }, - - is_object: function(a) { - return a && typeof a == "object"; - }, - - is_array: function(a) { - return Object.prototype.toString.call(a) === '[object Array]'; - }, - - /* - Gets rid of leading and trailing whitespace - */ - trim: function(s) { - return s.replace(/^\s*|\s*$/g, ""); - }, - - /* - Why, why, why? Because IE. Cry, cry cry. - */ - map: function(array, fn) { - if (typeof array.map == "function") { - return array.map(fn); - } else { - var r = []; - var l = array.length; - for (var i = 0; i < l; i++) { - r.push(fn(array[i])); - } - return r; - } - } - }; - - return({ - name: "mustache.js", - version: "0.3.1-dev", - - /* - Turns a template and view into HTML - */ - to_html: function(template, view, partials, send_fun) { - var renderer = new Renderer(); - if (send_fun) { - renderer.send = send_fun; - } - renderer.render(template, view, partials); - if (!send_fun) { - return renderer.buffer.join("\n"); - } - } - }); - }(); - - $.mustache = function(template, view, partials, send_fun) { - return Mustache.to_html(template, view, partials, send_fun); - }; -})(); \ No newline at end of file diff --git a/spec/javascripts/widgets/i18n-spec.js b/spec/javascripts/widgets/i18n-spec.js index d264c9544..28efb2f94 100644 --- a/spec/javascripts/widgets/i18n-spec.js +++ b/spec/javascripts/widgets/i18n-spec.js @@ -9,7 +9,7 @@ describe("Diaspora", function() { var locale = { namespace: { message: "hey", - template: "{{myVar}}", + template: "<%= myVar %>", otherNamespace: { message: "hello from another namespace", otherMessage: { @@ -95,4 +95,4 @@ describe("Diaspora", function() { }); }); }); -}); \ No newline at end of file +});