Changeset 1648
- Timestamp:
- 02/23/08 16:48:35 (3 months ago)
- Files:
-
- trunk/app/models/blog.rb (modified) (2 diffs)
- trunk/app/views/admin/content/_articles.html.erb (modified) (1 diff)
- trunk/app/views/admin/content/_form.html.erb (modified) (4 diffs)
- trunk/app/views/admin/feedback/list.html.erb (modified) (1 diff)
- trunk/app/views/admin/settings/index.html.erb (modified) (2 diffs)
- trunk/lang/de_DE.rb (modified) (5 diffs)
- trunk/lang/es_MX.rb (modified) (6 diffs)
- trunk/lang/fr_FR.rb (modified) (6 diffs)
- trunk/lang/it_IT.rb (modified) (6 diffs)
- trunk/lang/pl_PL.rb (modified) (6 diffs)
- trunk/lang/ro_RO.rb (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/app/models/blog.rb
r1614 r1648 59 59 setting :canonical_server_url, :string, '' # Deprecated 60 60 setting :lang, :string, 'en_US' 61 setting :display_advanced, :integer, 062 61 63 62 # Spam … … 94 93 setting :send_outbound_pings, :boolean, true 95 94 setting :email_from, :string, 'typo@example.com' 96 setting :editor, :integer, 195 setting :editor, :integer, 2 97 96 setting :cache_option, :string, 'caches_action_with_params' 98 97 trunk/app/views/admin/content/_articles.html.erb
r1634 r1648 15 15 <td class="first"> <%= link_to_permalink article, h(article.title) %></td> 16 16 <td><%= article.categories.map { |c| link_to h(c.name), {:controller => 'admin/categories', :action => 'show', :id => c.id}}.join(", ") %></td> 17 <td><%= link_to _(pluralize(article.comments.size, 'comment ')), :controller => '/admin/comments', :article_id => article.id, :action => 'list' %></td>17 <td><%= link_to _(pluralize(article.comments.size, 'comments')), :controller => '/admin/comments', :article_id => article.id, :action => 'list' %></td> 18 18 <td><%= article.published_at.strftime("%d/%m/%Y at %H:%M") %></td> 19 19 <td><%= author_link(article)%></td> trunk/app/views/admin/content/_form.html.erb
r1636 r1648 39 39 </fieldset> 40 40 41 <% if this_blog.display_advanced == 1 %>42 41 <fieldset class="set admin"> 43 42 <legend><%= _("Upload")%></legend> … … 46 45 </div> 47 46 </fieldset> 48 <% end %>49 47 50 48 <fieldset class="set admin"> 51 49 <legend><%= _("Options")%></legend> 52 50 <ul> 53 <% if this_blog.display_advanced == 1 %>54 51 <li> 55 52 <label for="article_permalink" class="float"><%= _("Permalink")%>:</label> … … 64 61 <%= check_box 'article', 'allow_pings' %> 65 62 </li> 66 <% else %>67 <%= hidden_field_tag 'article_allow_comments', 1 %>68 <%= hidden_field_tag 'article_allow_pings', 1 %>69 <% end %>70 63 <li> 71 64 <label for="article_published" class="float"><%= _("Online")%>:</label> … … 76 69 <%= datetime_select 'article', 'published_at', :include_blank => true %> 77 70 </li> 78 <% if this_blog.display_advanced == 1 %>79 71 <li> 80 72 <label for="article_text_filter" class="float"><%= _("Textfilter")%>: </label> 81 73 <%= select 'article', 'text_filter', text_filter_options %> 82 74 </li> 83 <% else %>84 <%= hidden_field_tag 'article_text_filter', this_blog.text_filter%>85 <% end %>86 75 </ul> 87 76 </fieldset> trunk/app/views/admin/feedback/list.html.erb
r1587 r1648 6 6 <%= task_showmod(count_unconfirmed, "Limit to unconfirmed", limit_to_unconfirmed) %> 7 7 <%= task_showmod(count_unconfirmed_spam, "Limit to unconfirmed spam", limit_to_unconfirmed_spam) %> 8 <%= tab _("Blacklist"), :controller=>"blacklist", :action=>"index" if (this_blog.display_advanced == 1)%>8 <%= tab _("Blacklist"), :controller=>"blacklist", :action=>"index" %> 9 9 <% end %> 10 10 trunk/app/views/admin/settings/index.html.erb
r1611 r1648 27 27 </li> 28 28 <li> 29 <label class="float" for="base_ url"><%= _("Blog URL")%>:</label>29 <label class="float" for="base_wurl"><%= _("Blog URL")%>:</label> 30 30 <input name="setting[base_url]" id="base_url" type="text" value="<%=h this_blog.base_url %>" size="<%= this_blog.base_url.length %> " /> 31 31 </li> … … 35 35 <%= fetch_langs %> 36 36 </select> 37 </li>38 <li><%= _("This option let you choose between the simple admin interface or the complete one, displaying much more options and therefore more complicated to use. For advanced users only!") %></li>39 <li>40 <label class="float" for="display_advanced">Choose interface:</label>41 <input type="radio" name="setting[display_advanced]" value="0" id="display_advanced_0" <%= 'checked="checked"' if this_blog.display_advanced == 0 %>/>42 <label for="display_advanced_0"><%= _("Use simple interface (default)")%></label>43 <span class="float">44 <input type="radio" name="setting[display_advanced]" value="1" id="display_advanced_1" <%= 'checked="checked"' if this_blog.display_advanced == 1 %>/>45 <label for="display_advanced_1"><%= _("Use complete admin")%></label>46 </span>47 37 </li> 48 38 <li><%= _("By default, Typo generates static HTML pages for your posts. However, if you plan to publish posts in the futur, you may want to use semi dynamic caching") %>.</li> trunk/lang/de_DE.rb
r1587 r1648 6 6 l.store "Feedback", "Diskussion" 7 7 l.store "Design", "Design" 8 l.store " Users", ["Benutzer", "Benutzer"]8 l.store "%d Users", ["Benutzer", "%d Benutzer"] 9 9 l.store "Settings", "Einstellungen" 10 10 l.store "Things you can do", "Folgendes können Sie tun ..." … … 64 64 #admin/cache/list.rhtml 65 65 l.store "Cache", "Cache" 66 l.store "There are %d entries in the page cache", ["Eine Seite im Cache", "%d Seiten sind aktuell im Cache"]67 66 68 67 #admin/categories/_categories.rhtml 69 68 l.store "Category title", "Name der Kategorie" 70 l.store " Articles", ["Artikel", "Artikel"]69 l.store "%d Articles", ["Artikel", "%d Artikel"] 71 70 72 71 #admin/categories/_form.rhtml … … 78 77 79 78 #admin/categorie/destroy.rhtml 80 l.store " Categories", ["Kategorie", "Kategorien"]79 l.store "%d Categories", ["Kategorie", "%d Kategorien"] 81 80 l.store "Show this category", "Kategorie anzeigen" 82 81 l.store "Delete this category", "Kategorie löschen" … … 128 127 l.store "Post title", "Titel des Artikels" 129 128 l.store "Posted at", "Veröffentlicht am" 130 l.store " Comments", ["Kommentar", "Kommentare"]131 l.store " Trackbacks", ["Trackback", "Trackbacks"]129 l.store "%d Comments", ["Kommentar", "%d Kommentare"] 130 l.store "%d Trackbacks", ["Trackback", "%d Trackbacks"] 132 131 l.store "Status", "Status" 133 132 l.store "Offline", "Offline" … … 145 144 l.store "Article Content", "Artikel Inhalt" 146 145 l.store "Extended Content", "Erweiterter Inhalt" 147 l.store " Tags", ["Tag", "Tags"]146 l.store "%d Tags", ["Tag", "%d Tags"] 148 147 l.store "Save", "Speichern" 149 148 l.store "Article Attachments", "Artikel AnhÀnge" trunk/lang/es_MX.rb
r1643 r1648 8 8 l.store "Discuss", "Discusión" 9 9 l.store "Design", "Diseño" 10 l.store " Users", ["Usuario", "Usuarios"]10 l.store "%d Users", ["Usuario", "%d Usuarios"] 11 11 l.store "Settings", "Configuración" 12 12 l.store "Things you can do", "Cosas que puedes hacer" … … 66 66 #admin/cache/list.rhtml 67 67 l.store "Cache", "Caché" 68 l.store "There are %d entries in the page cache", ["Hay %d página en el caché","Hay %d páginas en el caché de páginas"]69 68 70 69 #admin/categories/_categories.rhtml 71 70 l.store "Category title", "Título de la categoría" 72 l.store " Articles", ["Artículo", "Artículos"]71 l.store "%d Articles", ["Artículo", "%d Artículos"] 73 72 74 73 #admin/categories/_form.rhtml … … 80 79 81 80 #admin/categorie/destroy.rhtml 82 l.store " Categories", ["Categorí", "Categorías"]81 l.store "%d Categories", ["Categorí", "%d Categorías"] 83 82 l.store "Show this category", "Mostrar esta categoría" 84 83 l.store "Delete this category", "Eliminar esta categoría" … … 130 129 l.store "Post title", "Título del artículo" 131 130 l.store "Posted at", "Publicado el" 132 l.store " Comments", ["Comentario", "Comentarios"]133 l.store " Trackbacks", ["Trackback", "Trackbacks"]131 l.store "%d Comments", ["Comentario", "%d Comentarios"] 132 l.store "%d Trackbacks", ["Trackback", "%d Trackbacks"] 134 133 l.store "Status", "Estado" 135 134 l.store "Offline", "Offline" … … 146 145 l.store "Article Content", "Contenido del Artículo" 147 146 l.store "Extended Content", "Contenido Extendido" 148 l.store "Tags", ["Tag", "Tags"]147 l.store "Tags", "Tags" 149 148 l.store "Save", "Guardar" 150 149 l.store "Article Attachments", "Archivos adjuntos" … … 270 269 l.store "Empty Fragment Cache", "Limpiar el caché por fragmentos" 271 270 l.store "Rebuild cached HTML", "Reconstruir HTML cacheado" 272 l.store "There are %d entries in the cache", ["Hay %d página en el caché", "Hay %d páginas en el caché"]273 271 l.store "days", "días" 274 272 trunk/lang/fr_FR.rb
r1634 r1648 8 8 l.store "Themes", "ThÚmes" 9 9 l.store "Plugins", "Greffons" 10 l.store "Users", ["Utilisateur", "Utilisateurs"]10 l.store "Users", "Utilisateurs" 11 11 l.store "Settings", "Configuration" 12 12 l.store "Things you can do", "Vous pouvez" … … 83 83 #admin/cache/list.rhtml 84 84 l.store "Cache", "Cache" 85 l.store "There are %d entries in the page cache", ["Une seule page en cache", "%d pages sont actuellement stockées en cache"]86 85 87 86 #admin/categories/_categories.rhtml 88 87 l.store "Category title", "Nom de la catégorie" 89 l.store " Articles", ["Billet", "Billets"]88 l.store "%d Articles", ["Un Billet", "%d Billets"] 90 89 91 90 #admin/categories/_form.rhtml … … 97 96 98 97 #admin/categorie/destroy.rhtml 99 l.store " Categories", ["Catégorie", "Catégories"]98 l.store "%d categories", ["Une catégorie", "%d Catégories"] 100 99 l.store "Show this category", "Voir cette catégorie" 101 100 l.store "Delete this category", "Supprimer cette catégorie" … … 154 153 l.store "Post title", "Titre du billet" 155 154 l.store "Posted at", "Date de publication" 156 l.store " Comments", ["Commentaire", "Commentaires"]157 l.store " Trackbacks", ["Rétrolien", "Rétroliens"]155 l.store "%d Comments", ["Un commentaire", "%d Commentaires"] 156 l.store "%d Trackbacks", ["Un rétrolien", "%d Rétroliens"] 158 157 l.store "View", "Voir" 159 158 l.store "Status", "Ãtat" … … 174 173 l.store "Article Content", "Contenu du billet" 175 174 l.store "Extended Content", "Contenu étendu" 176 l.store "Tags", ["Mot clé", "Mots clé"]175 l.store "Tags", "Mots clés" 177 176 l.store "Save", "Sauver" 178 177 l.store "Article Attachments", "PiÚces Jointes" … … 300 299 l.store "Empty Fragment Cache", "Vider le cache" 301 300 l.store "Rebuild cached HTML", "Reconstruire le HTML en cache" 302 l.store "There are %d entries in the cache", ["Une seule page en cache", "%d pages sont actuellement stockées en cache"]303 301 l.store "days", "jours" 304 302 trunk/lang/it_IT.rb
r1627 r1648 7 7 l.store "Feedback", "Commenti" 8 8 l.store "Design", "Temi" 9 l.store " Users", ["Utente", "Utenti"]9 l.store "%d Users", ["Utente", "%d Utenti"] 10 10 l.store "Settings", "Configurazione" 11 11 l.store "Things you can do", "Cose che puoi fare" … … 80 80 #admin/cache/list.rhtml 81 81 l.store "Cache", "Cache" 82 l.store "There are %d entries in the page cache", ["Una sola pagina nella cache", "Ci sono %d pagine nella cache"]83 82 84 83 #admin/categories/_categories.rhtml 85 84 l.store "Category title", "Nome della categoria" 86 l.store " Articles", ["Categoria", "Categorie"]85 l.store "%d Articles", ["Categoria", "%d Categorie"] 87 86 88 87 #admin/categories/_form.rhtml … … 94 93 95 94 #admin/categorie/destroy.rhtml 96 l.store " Categories", ["Categoria", "Categorie"]95 l.store "%d Categories", ["Categoria", "%d Categorie"] 97 96 l.store "Show this category", "Mostra questa categoria" 98 97 l.store "Delete this category", "Elimina questa categoria" … … 150 149 l.store "Post title", "Titolo articolo" 151 150 l.store "Posted at", "Data pubblicazione" 152 l.store " Comments", ["Commento", "Commenti"]153 l.store " Trackbacks", ["Trackback", "Trackbacks"]151 l.store "%d Comments", ["Commento", "%d Commenti"] 152 l.store "%d Trackbacks", ["Trackback", "%d Trackbacks"] 154 153 l.store "View", "Vedi" 155 154 l.store "Status", "Stato" … … 172 171 l.store "Article Content", "Contenuto Articolo" 173 172 l.store "Extended Content", "Contenuto esteso" 174 l.store " Tags", ["Tag", "Tags"]173 l.store "%d Tags", ["Tag", "%d Tags"] 175 174 l.store "Save", "Salva" 176 175 l.store "Article Attachments", "Allegati articolo" … … 312 311 l.store "Empty Fragment Cache", "Svuota la cache" 313 312 l.store "Rebuild cached HTML", "Ricostruisci l'html in cache" 314 l.store "There are %d entries in the cache", ["Una sola pagina nella cache", "%d pagine sono attualmente nella cache"]315 313 l.store "days", "giorni" 316 314 trunk/lang/pl_PL.rb
r1643 r1648 11 11 l.store "Design", "WyglÄ 12 12 d" 13 l.store " Users", ["UÅŒytkownik", "UÅŒytkownicy"]13 l.store "%d Users", ["UÅŒytkownik", "%d UÅŒytkownicy"] 14 14 l.store "Settings", "Ustawienia" 15 15 l.store "Things you can do", "DostÄpne dziaÅania" … … 88 88 #admin/cache/list.rhtml 89 89 l.store "Cache", "Bufor" 90 l.store "There are %d entries in the page cache", ["Bufor jest pusty", "Bufor zawiera %d pozycje", "Bufor zawiera %d pozycji"]91 90 92 91 #admin/categories/_categories.rhtml 93 92 l.store "Category title", "TytuÅ kategorii" 94 l.store " Articles", ["ArtykuÅ", "ArtykuÅy"]93 l.store "%d Articles", ["ArtykuÅ", "%d ArtykuÅy"] 95 94 96 95 #admin/categories/_form.rhtml … … 102 101 103 102 #admin/categorie/destroy.rhtml 104 l.store " Categories", ["Kategoria", "Kategorie"]103 l.store "%d Categories", ["Kategoria", "%d Kategorie"] 105 104 l.store "Show this category", "PokaÅŒ tÄ 106 105 kategoriÄ" … … 167 166 l.store "Post title", "TytuÅ wpisu" 168 167 l.store "Posted at", "Data publikacji" 169 l.store " Comments", ["Komentarz", "Komentarze"]170 l.store " Trackbacks", ["Trackback", "Trackbacki"]168 l.store "%d Comments", ["Komentarz", "%d Komentarze"] 169 l.store "%d Trackbacks", ["Trackback", "%d Trackbacki"] 171 170 l.store "View", "Obejrzyj" 172 171 l.store "Status", "Stan" … … 189 188 l.store "Article Content", "TreÅÄ artykuÅu" 190 189 l.store "Extended Content", "TreÅÄ rozszerzona" 191 l.store " Tags", ["Tag", "Tagi"]190 l.store "%d Tags", ["Tag", "%d Tagi"] 192 191 l.store "Save", "Zapisz" 193 192 l.store "Article Attachments", "ZaÅÄ … … 361 360 l.store "Empty Fragment Cache", "UsuÅ bufor fragmentów" 362 361 l.store "Rebuild cached HTML", "Przebuduj bufor HTML" 363 l.store "There are %d entries in the cache", ["Brak pozycji w buforze", "Bufor zawiera %d pozycje", "Bufor zawiera %d pozycji"]364 362 l.store "days", "dni" 365 363 trunk/lang/ro_RO.rb
r1587 r1648 6 6 l.store "Discuss", "DiscuÈii" 7 7 l.store "Design", "Design" 8 l.store " Users", ["Utilizator", "Utilizatori"]8 l.store "%d Users", ["Utilizator", "%d Utilizatori"] 9 9 l.store "Settings", "Configurare" 10 10 l.store "Things you can do", "AcÈiuni" … … 64 64 #admin/cache/list.rhtml 65 65 l.store "Cache", "Cache" 66 l.store "There are %d entries in the page cache", ["Ãn cache se aflÄ o singurÄ paginÄ", "Ãn cache se pÄstreazÄ %d pagini"]67 66 68 67 #admin/categories/_categories.rhtml 69 68 l.store "Category title", "Numele categoriei" 70 l.store " Articles", ["Articol", "Articole"]69 l.store "%d Articles", ["Articol", "%d Articole"] 71 70 72 71 #admin/categories/_form.rhtml … … 78 77 79 78 #admin/categorie/destroy.rhtml 80 l.store " Categories", ["Categorie", "Categorii"]79 l.store "%d Categories", ["Categorie", "%d Categorii"] 81 80 l.store "Show this category", "AfiÈeazÄ aceastÄ categorie" 82 81 l.store "Delete this category", "Èterge aceastÄ categorie" … … 128 127 l.store "Post title", "Titlul articolului" 129 128 l.store "Posted at", "Data publicÄrii" 130 l.store " Comments", ["Comentariu", "Comentarii"]131 l.store " Trackbacks", ["RetrolegÄturÄ", "RetrolegÄturi"]129 l.store "%d Comments", ["Comentariu", "%d Comentarii"] 130 l.store "%d Trackbacks", ["RetrolegÄturÄ", "%d RetrolegÄturi"] 132 131 l.store "Status", "Status" 133 132 l.store "Offline", "Offline" … … 144 143 l.store "Article Content", "ConÈinutul articolului" 145 144 l.store "Extended Content", "ConÈinutul extins" 146 l.store " Tags", ["Cuvînt cheie", "Cuvinte cheie"]145 l.store "%d Tags", ["Cuvînt cheie", "%d Cuvinte cheie"] 147 146 l.store "Save", "SalveazÄ" 148 147 l.store "Article Attachments", "AtaÈamentele articolului" … … 268 267 l.store "Empty Fragment Cache", "GoleÈte cache" 269 268 l.store "Rebuild cached HTML", "ReconstruieÈte paginile din cache" 270 l.store "There are %d entries in the cache", ["O singurÄ paginÄ se aflÄ Ã®n cache", "Ãn cache se pÄstreazÄ %d pagini"]271 269 l.store "days", "zile" 272 270
