Changeset 1650
- Timestamp:
- 02/24/08 08:45:45 (3 months ago)
- Files:
-
- trunk/app/views/admin/settings/index.html.erb (modified) (1 diff)
- trunk/app/views/admin/themes/index.html.erb (modified) (1 diff)
- trunk/lang/fr_FR.rb (modified) (4 diffs)
- trunk/themes/dirtylicious/layouts/default.html.erb (modified) (2 diffs)
- trunk/themes/dirtylicious/views/shared/_search.html.erb (modified) (1 diff)
- trunk/themes/scribbish/layouts/default.html.erb (modified) (1 diff)
- trunk/themes/scribbish/views/articles/comment_preview.html.erb (modified) (1 diff)
- trunk/themes/scribbish/views/articles/index.html.erb (modified) (1 diff)
- trunk/themes/scribbish/views/articles/read.html.erb (modified) (2 diffs)
- trunk/themes/scribbish/views/articles/_article.html.erb (modified) (3 diffs)
- trunk/themes/scribbish/views/articles/_comment.html.erb (modified) (1 diff)
- trunk/themes/scribbish/views/articles/_comment_form.html.erb (modified) (4 diffs)
- trunk/themes/scribbish/views/articles/_comment_list.html.erb (modified) (1 diff)
- trunk/themes/scribbish/views/articles/_trackback.html.erb (modified) (1 diff)
- trunk/themes/scribbish/views/shared/_search.html.erb (modified) (1 diff)
- trunk/themes/standard_issue/views/articles/comment_preview.html.erb (modified) (1 diff)
- trunk/themes/standard_issue/views/articles/index.html.erb (modified) (1 diff)
- trunk/themes/standard_issue/views/articles/read.html.erb (modified) (2 diffs)
- trunk/themes/standard_issue/views/articles/_comment_form.html.erb (modified) (2 diffs)
- trunk/themes/standard_issue/views/articles/_comment_list.html.erb (modified) (1 diff)
- trunk/themes/standard_issue/views/articles/_trackback.html.erb (modified) (1 diff)
- trunk/themes/standard_issue/views/shared/_search.html.erb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/app/views/admin/settings/index.html.erb
r1648 r1650 38 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> 39 39 <li> 40 <label class="float" for="caches_page"> Choose caching methode:</label>40 <label class="float" for="caches_page"><%= _("Choose caching methode")%>:</label> 41 41 <input type="radio" name="setting[cache_option]" value="caches_page" id="cache_option_0" <%= 'checked="checked"' if this_blog.cache_option == 'caches_page' %>/> 42 42 <label for="cache_option_0"><%= _("Use static HTML page caching ")%></label> trunk/app/views/admin/themes/index.html.erb
r1627 r1650 6 6 7 7 <p class="paginate l"> 8 You can download third party themes from officially supported <a href="http://www.dev411.com/typo/themes/">dev 411 Typo themes viewer</a>.8 <%= _("You can download third party themes from officially supported %s ", link_to(_("dev 411 Typo themes viewer"), 'http://www.dev411.com/typo/themes/'))%>. 9 9 </p> 10 10 trunk/lang/fr_FR.rb
r1649 r1650 246 246 l.store "Blog subtitle", "Sous-titre du blog" 247 247 l.store "Language", "Langue" 248 l.store "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!", "Cette option permet de choisir entre l'interface d'administration simple ou la complÚte qui affiche beaucoup plus d'options et qui est donc plus compliqué à utiliser. Uniquement pour les utilisateurs avancés!"249 248 l.store "Blog URL", "Adresse du blog" 250 249 l.store "Latitude, Longitude", "Latitude, Longitude" … … 303 302 l.store "Rebuild cached HTML", "Reconstruire le HTML en cache" 304 303 l.store "days", "jours" 304 l.store "General options", "Options générales" 305 l.store "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", "Par défaut, Typo génÚre des pages HTML statiques. Cependant, si vous prévoyez d'utiliser les fonctionnalités de publication dans le futur, il vous faudra utiliser le cache dynamique" 306 l.store "Use static HTML page caching", "Utiliser le cache statique" 307 l.store "Use semi static caching (default)", "Utiliser le cache dynamique (option par défaut)" 308 l.store "Choose caching methode", "Sélectionnez la méthode de cache" 305 309 306 310 #admin/general/update_database … … 426 430 427 431 #admin/themes/index.rhtml 428 l.store "Choose a theme", "Choisissez un thÚme" 432 l.store "Choose theme", "Choisissez un thÚme" 433 l.store "Theme editor", "Ãditeur de thÚmes" 429 434 l.store "Activate", "Activer" 430 435 l.store "Active theme", "ThÚme actif" 436 l.store "You can download third party themes from officially supported %s ", "Vous pouvez télécharger des thÚmes officiellement supportés sur %s " 437 l.store "dev 411 Typo themes viewer", "le visualisateur de thÚmes de dev411" 431 438 432 439 #admin/trackbacks/edit.rhtml … … 583 590 l.store "or a %s from your own site", "ou un %s depuis votre site" 584 591 l.store "later", "plus tard" 585 l.store "Leave a comment", " déposer un commentaire"592 l.store "Leave a comment", "laisser un commentaire" 586 593 l.store "Name %s", "Votre nom %s" 587 594 l.store "required", "obligatoire" 595 l.store "Preview", "Prévisualiser " 596 l.store "enabled", "activés" 597 l.store "never displayed", "jamais affichés" 598 l.store "Comments", "Commentaires" 599 l.store "Website", "Votre site" 600 l.store "Textile enabled", "Textile activé" 601 l.store "Markdown enabled", "Markdown activé" 602 l.store "Submit", "Envoyer" 603 l.store "is about to say", "va dire" 604 l.store "Older posts", "Billets précédents" 605 l.store "Use the following link to trackback from your own site", "Utilisez le lien ci-dessous pour envoyer un trackback depuis votre site" 606 l.store "Leave a response", "Réagir à ce billet" 607 l.store "styled width %s", "design %s" 608 l.store "Searching", "Recherche en cours" 609 l.store "permalink", "lien permanent" 610 l.store "Name", "Nom" 611 l.store "leave url/email", "laissez votre url/courriel" 612 l.store "No comments", "Pas de commentaires" 613 l.store "From", "De" 588 614 end trunk/themes/dirtylicious/layouts/default.html.erb
r1641 r1650 19 19 <ul> 20 20 <li class="page_item <%= 'current_page_item' if (controller.controller_name == "articles" and controller.action_name == "index") %>"> 21 <%= link_to "Home", this_blog.base_url %>21 <%= link_to _("Home"), this_blog.base_url %> 22 22 </li> 23 23 <li class="page_item <%= 'current_page_item' if (controller.action_name != 'index' and controller.action_name != 'view_page') %>"> 24 <%= link_to "Articles", {:controller => "articles", :action => "archives"} if (controller.controller_name != "index" )%>24 <%= link_to _("Articles"), {:controller => "articles", :action => "archives"} if (controller.controller_name != "index" )%> 25 25 </li> 26 26 <li class="page_item <%= 'current_page_item' if (controller.controller_name == "articles" and controller.action_name == "view_page" and params[:name].to_s == 'about') %>"> 27 <%= link_to "About", this_blog.base_url + "/pages/about" %>27 <%= link_to _("About"), this_blog.base_url + "/pages/about" %> 28 28 </li> 29 29 </ul> … … 49 49 <div class="left"><%= link_to this_blog.blog_name, this_blog.base_url %></div> 50 50 <div class="right"> 51 powered by <%= link_to 'typo', 'http://typosphere.org' %> / 52 styled with <%= link_to 'Dirtylicious', ' http://templates.arcsin.se/' %> 51 <%= _("Designed by %s ported to typo by %s ", link_to ('Dirtylicious', ' http://templates.arcsin.se/'), 52 link_to ("Frédéric de Villamil", 'http://fredericdevillamil.com')) %> <br /> 53 <%= _("Powered by %s", link_to ('typo', 'http://typosphere.org')) %> 53 54 </div> 54 55 <div class="clearer"></div> trunk/themes/dirtylicious/views/shared/_search.html.erb
r1580 r1650 5 5 <% end -%> 6 6 </ul> 7 <div id="loading" class="loading" style="display:none;"> Searching...</div>7 <div id="loading" class="loading" style="display:none;"><%=_("Searching")%>...</div> 8 8 <div id="results" class="results"></div> 9 9 <%= observe_field 'q', trunk/themes/scribbish/layouts/default.html.erb
r1552 r1650 34 34 <p><%= link_to this_blog.blog_name, this_blog.base_url %></p> 35 35 <ul> 36 <li>powered by <%= link_to 'typo', 'http://typosphere.org' %> / 37 styled with <%= link_to 'scribbish', 'http://quotedprintable.com/pages/scribbish' %></li> 36 <li> 37 <%= _("Powered by %s", link_to ('typo', 'http://typosphere.org')) %> / 38 <%= _("styled with %s", link_to ('scribbish', 'http://quotedprintable.com/pages/scribbish'))%> 39 </li> 38 40 </ul> 39 41 </div> trunk/themes/scribbish/views/articles/comment_preview.html.erb
r1552 r1650 3 3 <%= content_tag(:div, gravatar_tag(@comment.email)) if this_blog.use_gravatar and @comment.email %> 4 4 <cite><%= (@comment.url.blank?) ? h(@comment.author) : link_to(h(@comment.author), @comment.url) %></cite> 5 <abbr> is about to say</abbr>5 <abbr><%= _("is about to say") %></abbr> 6 6 </div> 7 7 <div class="content"> trunk/themes/scribbish/views/articles/index.html.erb
r1552 r1650 2 2 3 3 <% unless @pages.item_count <= this_blog.limit_article_display -%> 4 <p class="pagination"> Older posts: <%= pagination_links @pages, :params => { :action => @controller.action_name } %></p>4 <p class="pagination"><%= _("Older posts")%>: <%= pagination_links @pages, :params => { :action => @controller.action_name } %></p> 5 5 <% end -%> trunk/themes/scribbish/views/articles/read.html.erb
r1552 r1650 18 18 19 19 <% if @article.allow_pings? -%> 20 <h5><a name="trackbacks"> Trackbacks</a></h5>20 <h5><a name="trackbacks"><%= _("Trackbacks") %></a></h5> 21 21 <p> 22 Use the following link to trackback from your own site:<br />22 <%= _("Use the following link to trackback from your own site") %>:<br /> 23 23 <%= @article.trackback_url %> 24 24 </p> … … 32 32 33 33 <% if @article.allow_comments? or @article.published_comments.size > 0 -%> 34 <h5><a name="comments"> Comments</a></h5>35 <p><a href="#commentform"> Leave a response</a></p>34 <h5><a name="comments"><%= _("Comments") %></a></h5> 35 <p><a href="#commentform"><%= _("Leave a comment") %></a></p> 36 36 37 37 <div id="comments_div"> trunk/themes/scribbish/views/articles/_article.html.erb
r1640 r1650 6 6 7 7 <p class="author"> 8 Posted by<cite><%= author_link(article) %></cite>8 <%= _("Posted by")%> <cite><%= author_link(article) %></cite> 9 9 <abbr class="published" title="<%= article.published_at.xmlschema %>"><%= js_distance_of_time_in_words_to_now article.published_at %></abbr> 10 10 </p> … … 16 16 <div class="extended"> 17 17 <% if controller.action_name == 'index' -%> 18 <p><%= link_to_permalink article, "Continue reading..."%></p>18 <p><%= link_to_permalink article, _("Continue reading...") %></p> 19 19 <% else -%> 20 20 <%= article.html(:extended) %> … … 30 30 <%= trackbacks_link(article) << ',' if article.allow_pings? %> 31 31 <%= comments_link(article) << ',' if article.allow_comments? %> 32 <a href="<%= article.permalink_url %>" rel="bookmark"> permalink</a>,32 <a href="<%= article.permalink_url %>" rel="bookmark"><%=_("permalink")%></a>, 33 33 <a href="<%= @auto_discovery_url_rss %>">rss</a>, 34 34 <a href="<%= @auto_discovery_url_atom %>">atom</a> trunk/themes/scribbish/views/articles/_comment.html.erb
r1552 r1650 3 3 <%= content_tag(:div, gravatar_tag(comment.email)) if this_blog.use_gravatar and comment.email %> 4 4 <cite><%= (comment.url.blank?) ? h(comment.author) : link_to(h(comment.author), comment.url) %></cite> 5 <abbr title="<%= comment.created_at.xmlschema %>"><%= distance_of_time_in_words comment.article.published_at, comment.created_at %> later:</abbr>5 <abbr title="<%= comment.created_at.xmlschema %>"><%= distance_of_time_in_words comment.article.published_at, comment.created_at %> <%= _("later")%>:</abbr> 6 6 </div> 7 7 <div class="content"> trunk/themes/scribbish/views/articles/_comment_form.html.erb
r1554 r1650 11 11 12 12 <fieldset> 13 <legend> Comments</legend>13 <legend><%= _("Comments") %></legend> 14 14 <p> 15 <label> Name:<br />15 <label><%= _("Name")%>:<br /> 16 16 <%= text_field "comment", "author" %> 17 <small>(<%= link_to_function( "leave url/email»", "Effect.toggle('extra_fields', 'blind', {duration: .3})") %>)</small>17 <small>(<%= link_to_function(_("leave url/email") + " »", "Effect.toggle('extra_fields', 'blind', {duration: .3})") %>)</small> 18 18 </label> 19 19 </p> … … 21 21 <div id="extra_fields" style="display:none;"> 22 22 <p> 23 <label> Email: <%= content_tag('small', "(#{link_to('gravatar', 'http://gravatar.com')} enabled)") if this_blog.use_gravatar %><br />23 <label><%= _("Email") %>: <%= content_tag('small', "(#{link_to('gravatar', 'http://gravatar.com')} "+ _("enabled") + ")") if this_blog.use_gravatar %><br /> 24 24 <%= text_field "comment", "email" %> 25 25 </label> 26 26 </p> 27 27 <p> 28 <label> Url:<br />28 <label><%= _("Url")%>:<br /> 29 29 <%= text_field "comment", "url" %> 30 30 </label> … … 34 34 <p> 35 35 <label> 36 Comments:37 <%= content_tag('small', link_to( "Textile enabled", "http://hobix.com/textile/")) if this_blog.comment_text_filter.include? 'textile' %>38 <%= content_tag('small', link_to( "Markdown enabled", "http://daringfireball.net/projects/markdown/")) if this_blog.comment_text_filter.include? 'markdown' %>36 <%= _("Comments")%>: 37 <%= content_tag('small', link_to(_("Textile enabled"), "http://hobix.com/textile/")) if this_blog.comment_text_filter.include? 'textile' %> 38 <%= content_tag('small', link_to(_("Markdown enabled"), "http://daringfireball.net/projects/markdown/")) if this_blog.comment_text_filter.include? 'markdown' %> 39 39 <br /> 40 40 <%= text_area 'comment', 'body' %> … … 43 43 44 44 <p> 45 <%= submit_to_remote('preview', 'Preview!',45 <%= submit_to_remote('preview', _('Preview') + '!', 46 46 :update => 'preview', 47 47 :complete => "Element.show('preview')", 48 48 :url => preview_new_comment_path(@article)) %> 49 <%= submit_tag 'Submit', :id => 'form-submit-button', :onclick => "$('commentform').onsubmit();this.disabled=true;Element.hide('preview');return false;" %>49 <%= submit_tag _('Submit'), :id => 'form-submit-button', :onclick => "$('commentform').onsubmit();this.disabled=true;Element.hide('preview');return false;" %> 50 50 <%= image_tag '/images/theme/spinner.gif', :id => 'comment_loading', :style => 'display:none' %> 51 51 </p> trunk/themes/scribbish/views/articles/_comment_list.html.erb
r1552 r1650 3 3 <%= render(:partial => "comment", :collection => @article.published_comments) %> 4 4 <% else -%> 5 <li class="dummy_comment" style="display:none"> No comments</li>5 <li class="dummy_comment" style="display:none"><%= _("No comments")%></li> 6 6 <% end -%> 7 7 </ol> trunk/themes/scribbish/views/articles/_trackback.html.erb
r1552 r1650 2 2 <div class="author"> 3 3 <a href="<%= trackback.url %>" rel="nofollow"><%= trackback.title %></a> 4 <abbr> From<cite><%= trackback.blog_name %></cite></abbr>4 <abbr><% _("From") %> <cite><%= trackback.blog_name %></cite></abbr> 5 5 </div> 6 6 <div class="content"> trunk/themes/scribbish/views/shared/_search.html.erb
r1580 r1650 5 5 <% end -%> 6 6 7 <div id="loading" class="loading" style="display:none;"> Searching...</div>7 <div id="loading" class="loading" style="display:none;"><%= _("Searching")%>...</div> 8 8 <div id="results" class="results"></div> 9 9 <%= observe_field 'q', trunk/themes/standard_issue/views/articles/comment_preview.html.erb
r1566 r1650 3 3 <%= content_tag(:div, gravatar_tag(@comment.email)) if this_blog.use_gravatar and @comment.email %> 4 4 <cite><%= (@comment.url.blank?) ? h(@comment.author) : link_to(h(@comment.author), @comment.url) %></cite> 5 <abbr> is about to say</abbr>5 <abbr><%= _("is about to say")%></abbr> 6 6 </div> 7 7 <div class="content"> trunk/themes/standard_issue/views/articles/index.html.erb
r1566 r1650 2 2 3 3 <% unless @pages.item_count <= this_blog.limit_article_display -%> 4 <p class="pagination"> Older posts: <%= pagination_links @pages, :params => { :action => @controller.action_name } %></p>4 <p class="pagination"><%= _("Older posts")%>: <%= pagination_links @pages, :params => { :action => @controller.action_name } %></p> 5 5 <% end -%> trunk/themes/standard_issue/views/articles/read.html.erb
r1566 r1650 18 18 19 19 <% if @article.allow_pings? -%> 20 <h2><a name="trackbacks"> Trackbacks</a></h2>20 <h2><a name="trackbacks"><%= _("Trackbacks")%></a></h2> 21 21 <p> 22 Use the following link to trackback from your own site:<br />22 <%= _("Use the following link to trackback from your own site")%>:<br /> 23 23 <%= @article.trackback_url %> 24 24 </p> … … 32 32 33 33 <% if @article.allow_comments? or @article.published_comments.size > 0 -%> 34 <h2><a name="comments"> Comments</a></h2>35 <p><a href="#commentform"> Leave a response</a></p>34 <h2><a name="comments"><%= _("Comments")%></a></h2> 35 <p><a href="#commentform"><%= _("Leave a response")%></a></p> 36 36 37 37 <div id="comments_div"> trunk/themes/standard_issue/views/articles/_comment_form.html.erb
r1649 r1650 20 20 <p> 21 21 <%= text_field "comment", "email" %> 22 <label for="comment_email"> Email <%= content_tag('small', "(#{link_to('gravatar', 'http://gravatar.com')} enabled)") if this_blog.use_gravatar %> <small>(never displayed)</small></label>22 <label for="comment_email"><%= _("Email")%> <%= content_tag('small', "(#{link_to('gravatar', 'http://gravatar.com')} "+ _("enabled") + ")") if this_blog.use_gravatar %> <small>(<%= _("never displayed") %>)</small></label> 23 23 </p> 24 24 <p><%= text_field "comment", "url" %> 25 <label> Website</label>25 <label><%= _("Website")%></label> 26 26 </p> 27 27 28 28 <p> 29 29 <label> 30 Comments:31 <%= content_tag('small', link_to( "Textile enabled", "http://hobix.com/textile/")) if this_blog.comment_text_filter.include? 'textile' %>32 <%= content_tag('small', link_to( "Markdown enabled", "http://daringfireball.net/projects/markdown/")) if this_blog.comment_text_filter.include? 'markdown' %>30 <%= _("Comments")%>: 31 <%= content_tag('small', link_to(_("Textile enabled"), "http://hobix.com/textile/")) if this_blog.comment_text_filter.include? 'textile' %> 32 <%= content_tag('small', link_to(_("Markdown enabled"), "http://daringfireball.net/projects/markdown/")) if this_blog.comment_text_filter.include? 'markdown' %> 33 33 <br /> 34 34 <%= text_area 'comment', 'body', :rows => 10 %> … … 37 37 38 38 <p> 39 <%= submit_to_remote('preview', 'Preview!',39 <%= submit_to_remote('preview', _('Preview') + '!', 40 40 :update => 'preview', 41 41 :complete => "Element.show('preview')", 42 42 :url => preview_new_comment_path(@article), 43 43 :html => {:class => 'submit'}) %> 44 <%= submit_tag 'Submit', :id => 'form-submit-button', :class => 'submit', :onclick => "$('commentform').onsubmit();this.disabled=true;Element.hide('preview');return false;" %>44 <%= submit_tag _('Submit'), :id => 'form-submit-button', :class => 'submit', :onclick => "$('commentform').onsubmit();this.disabled=true;Element.hide('preview');return false;" %> 45 45 <%= image_tag '/images/theme/spinner.gif', :id => 'comment_loading', :style => 'display:none' %> 46 46 </p> trunk/themes/standard_issue/views/articles/_comment_list.html.erb
r1566 r1650 3 3 <%= render(:partial => "comment", :collection => @article.published_comments) %> 4 4 <% else -%> 5 <li class="dummy_comment" style="display:none"> No comments</li>5 <li class="dummy_comment" style="display:none"><%= _("No comments")%></li> 6 6 <% end -%> 7 7 </ol> trunk/themes/standard_issue/views/articles/_trackback.html.erb
r1566 r1650 2 2 <div class="author"> 3 3 <a href="<%= trackback.url %>" rel="nofollow"><%= trackback.title %></a> 4 <abbr> From<cite><%= trackback.blog_name %></cite></abbr>4 <abbr><%_("From")%> <cite><%= trackback.blog_name %></cite></abbr> 5 5 </div> 6 6 <div class="content"> trunk/themes/standard_issue/views/shared/_search.html.erb
r1649 r1650 6 6 <% end -%> 7 7 8 <div id="loading" class="loading" style="display:none;"> Searching...</div>8 <div id="loading" class="loading" style="display:none;"><%= _("Searching")%>...</div> 9 9 <div id="results" class="results"></div> 10 10 <%= observe_field 'q',
