Changeset 1649

Timestamp:

02/24/08 00:10:22 (3 months ago)

Author:

neuro

Message:

Brings more translation
Adds some changes to the content editor
Brings localisation to Standard issue
Brings localisation to archives plugin
Fix typo version to 5.0.3

Files:

• trunk/app/helpers/content_helper.rb (modified) (1 diff)
• trunk/app/views/admin/categories/_categories.html.erb (modified) (1 diff)
• trunk/app/views/admin/content/_form.html.erb (modified) (3 diffs)
• trunk/lang/fr_FR.rb (modified) (5 diffs)
• trunk/lib/typo_version.rb (modified) (1 diff)
• trunk/public/stylesheets/administration.css (modified) (3 diffs)
• trunk/themes/standard_issue/layouts/default.html.erb (modified) (2 diffs)
• trunk/themes/standard_issue/views/articles/_article.html.erb (modified) (2 diffs)
• trunk/themes/standard_issue/views/articles/_comment.html.erb (modified) (1 diff)
• trunk/themes/standard_issue/views/articles/_comment_form.html.erb (modified) (1 diff)
• trunk/themes/standard_issue/views/shared/_search.html.erb (modified) (1 diff)
• trunk/vendor/plugins/archives_sidebar/lib/archives_sidebar.rb (modified) (1 diff)

trunk/app/helpers/content_helper.rb

@@ -71 +71 @@
-
-  def category_links(article)
-"Posted in
+_("Posted in") + "
-  end
-
-  def tag_links(article)
-"Tags
+_("Tags") + "
-  end
-

trunk/app/views/admin/categories/_categories.html.erb

@@ -3 +3 @@
-    <th class="first"><%= _("Title") %></th>
-    <th><%= _("Posts") %></th>
-Published
+Status
-    <th><%= _("View") %></th>
-    <th><%= _("Edit") %></th>

trunk/app/views/admin/content/_form.html.erb

@@ -2 +2 @@
-<!--[form:articles]-->
-<fieldset class="set admin" style="display: block">
+  <legend><%= _("Write post") %></legend>
-  <div <%='style="width: 48%; float: left;"' if this_blog.editor == 1 %>>
-     <ul>
@@ -13 +14 @@
-          <%= t_textarea 'article', 'body', {:height => '300', :style => 'width : 100%'} %>
-       </li>
-
-
+
+
+
+
+
+
+
-       </li>
-
-
-
-
-
-
-
+
+
+
+
+
-             <%= options_from_collection_for_select(@categories, "id", "name", @selected) %>
-                  </select>
-       </li>
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-     </ul>
-     <p class="r"><%= save(_("Save") + " &raquo;") %></p>
@@ -62 +83 @@
-     </li>
-     <li>
-       <label for="article_published" class="float"><%= _("Online")%>:</label>
-       <%= check_box 'article', 'published'  %>
-     </li>
-     <li>
-        <label for="article_published_at" class="float"><%= _("Publish at")%>:</label>
-        <%= datetime_select 'article', 'published_at', :include_blank => true  %>
-     </li>
-     <li>
-        <label for="article_text_filter" class="float"><%= _("Textfilter")%>: </label>
-select 'article', 'text_filter', text_filter_options
+hidden_field_tag 'text_filter', this_blog.text_filter
-     </li>
-  </ul>

trunk/lang/fr_FR.rb

@@ -12 +12 @@
-  l.store "Things you can do", "Vous pouvez"
-  l.store "with %s AER OS XK iconset iconset %s", "avec %s les icÃŽnes AER OS XK iconset %s"
-
+  
-  #accounts/login.rhtml
-  l.store "Administration", "Administration"
@@ -162 +162 @@
-  l.store "no comments", "aucun commentaire"
-  l.store "Posts", "Billets"
+  l.store "Comments", "Commentaires"
+  l.store "Categories", "Catégories"
+  
-  #admin/content/_attachment.rhtml
-  l.store "Remove", "Supprimer"
@@ -345 +348 @@
-  l.store "seperate with spaces", "séparez-les par des espaces"
-  l.store "Category", "Catégorie"
-
+
-  #admin/resources/_metadata_edit.rhtml
-  l.store "Remove iTunes Metadata", "Supprimer les méta données iTunes"
@@ -367 +370 @@
-  #admin/resources/new.rhtml
-  l.store "Upload a File to your Site", "Envoyer un fichier sur votre site"
-Envoyer
+Ajouter un fichier joint
-  l.store "Upload a new Resource", "Ajouter une piÚce jointe"
-  l.store "File", "Fichier"
@@ -550 +553 @@
-  l.store "Error occurred while updating Content Type.", "Une erreur est survenue lors de la mise à jour du type du contenu."
-  l.store "complete", "complet"
+  
+  # Themes
+  l.store "Home", "Accueil"
+  l.store "About", "À propos"
+  l.store "Designed by %s ported to typo by %s ", "Design par %s porté sous Typo par %s"
+  l.store "Powered by %s", "Propulsé par %s"
+  l.store "Read full article", "Lien permanent"
+  l.store "Search", "Chercher"
+  l.store "Continue reading...", "Lire la suite..."
+  l.store "Posted by", "Publié par"
+  l.store "January", "Janvier"
+  l.store "February", "Février"
+  l.store "March", "Mars"
+  l.store "April", "Avril"
+  l.store "May", "Mai"
+  l.store "June", "Juin"
+  l.store "July", "Juillet"
+  l.store "August", "Août"
+  l.store "Septembre", "Septembre"
+  l.store "October", "Octobre"
+  l.store "November", "Novembre"
+  l.store "December", "Décembre"
+  l.store "This entry was posted on %s", "Ce billet a été posté le %s"
+  l.store "Posted in", "Publié sous"
+  l.store "and %s", "et %s"
+  l.store "Atom feed", "flux Atom"
+  l.store "You can follow any any response to this entry through the %s", "Vous pouvez suivre la discussion autour de cet article via le %s"
+  l.store "You can leave a %s", "Vous pouvez déposer un %s"
+  l.store "or a %s from your own site", "ou un %s depuis votre site"
+  l.store "later", "plus tard"
+  l.store "Leave a comment", "déposer un commentaire"
+  l.store "Name %s", "Votre nom %s"
+  l.store "required", "obligatoire"
-end

trunk/lib/typo_version.rb

@@ -1 @@
-2
+3

trunk/public/stylesheets/administration.css

@@ -285 +285 @@
-
-.paginate {
-
+#e7e7e7 
-  padding: 5px 20px;
-  margin-bottom: 15px;
@@ -292 +292 @@
-        border-right: #ddd 1px solid;
-        text-align: center;
+
-}
-
@@ -942 +943 @@
-        padding-bottom: 0;
-}
+
+li.paginate {
+                margin-bottom: 15px;
+                border-left: #ddd 5px solid;
+}
+

trunk/themes/standard_issue/layouts/default.html.erb

@@ -17 +17 @@
-            <ul>
-                <li class="page_item <%= 'current_page_item' if (controller.controller_name == "articles" and controller.action_name == "index") %>">
-"Home"
+_("Home")
-                </li>
-                <li class="page_item <%= 'current_page_item' if (controller.action_name != 'index' and controller.action_name != 'view_page') %>">
-"Articles"
+_("Articles")
-                </li>
-                <li class="page_item <%= 'current_page_item' if (controller.controller_name == "articles" and controller.action_name == "view_page" and params[:name].to_s == 'about') %>">
-"About"
+_("About")
-                </li>
-            </ul>
@@ -49 +49 @@
-        <div class="wrap">
-        <p id="legal">
-Designed by <%= link_to 'NodeThirtyThree', 'http://www.nodethirtythree.com/' %> ported to Typo by
-<%= link_to "Frédéric de Villamil", 'http://fredericdevillamil.com' %>
-Powered by <%= link_to 'typo', 'http://typosphere.org'
+<%= _("Designed by %s ported to typo by %s ", link_to ('NodeThirtyThree', 'http://www.nodethirtythree.com/'), 
+link_to ("Frédéric de Villamil", 'http://fredericdevillamil.com')) %> 
+<%= _("Powered by %s", link_to ('typo', 'http://typosphere.org'))
-            </p>
-        </div>

trunk/themes/standard_issue/views/articles/_article.html.erb

@@ -7 +7 @@
-      <div class="extended">
-        <% if controller.action_name == 'index' -%>
-"Continue reading..."
+_("Continue reading...")
-        <% else -%>
-          <%= article.html(:extended) %>
@@ -16 +16 @@
-        <div class="meta">
-                <% if controller.controller_name == "articles" and controller.action_name == 'show' %>
-
+
+
+
+
+
+
-                        <small><%= tag_links(@article) unless @article.tags.empty? %></small></p>
-                <% else %>
-        <p class="author">
-Posted by
+<%= _("Posted by") %>
-        <abbr class="published" title="<%= article.published_at.xmlschema %>"><%= js_distance_of_time_in_words_to_now article.published_at %></abbr>
-        </p>

trunk/themes/standard_issue/views/articles/_comment.html.erb

@@ -3 +3 @@
-    <%= content_tag(:div, gravatar_tag(comment.email)) if this_blog.use_gravatar and comment.email %>
-    <cite><%= (comment.url.blank?) ? h(comment.author) : link_to(h(comment.author), comment.url) %></cite>
-later
+<%= _("later")%>
-  </div>
-    <%= comment.html %>

trunk/themes/standard_issue/views/articles/_comment_form.html.erb

@@ -11 +11 @@
-
-<div id="respond" class="post">
-Leave a comment
+<%= _("Leave a comment")%>
-
-  <p>
-                <%= text_field "comment", "author" %> 
-Name <small>(required)</small
+<%= _("Name %s", content_tag(:small, '('+_('required')+')' ))%
-  </p>
-

trunk/themes/standard_issue/views/shared/_search.html.erb

@@ -2 +2 @@
-    <% form_tag({ :controller => 'articles', :action => 'search' },
-                { :method => 'get', :id => 'sform' }) do -%>
-Search
+<%= _("Search")%>
-      <p><input type="text" id="q" name="q" value="" /></p>
-    <% end -%>

trunk/vendor/plugins/archives_sidebar/lib/archives_sidebar.rb

@@ -31 +31 @@
-    @archives = article_counts.map do |entry|
-      {
-"#{Date::MONTHNAMES[entry.month.to_i]}
+_(Date::MONTHNAMES[entry.month.to_i]) + "
-        :month => entry.month.to_i,
-        :year => entry.year.to_i,