Changeset 1634
- Timestamp:
- 02/15/08 00:03:15 (3 months ago)
- Files:
-
- trunk/app/controllers/accounts_controller.rb (modified) (2 diffs)
- trunk/app/views/accounts/logout.html.erb (modified) (1 diff)
- trunk/app/views/admin/categories/list.html.erb (modified) (2 diffs)
- trunk/app/views/admin/content/list.html.erb (modified) (1 diff)
- trunk/app/views/admin/content/new.html.erb (modified) (1 diff)
- trunk/app/views/admin/content/_articles.html.erb (modified) (1 diff)
- trunk/app/views/admin/content/_form.html.erb (modified) (1 diff)
- trunk/app/views/admin/dashboard/index.html.erb (modified) (3 diffs)
- trunk/app/views/admin/pages/list.html.erb (modified) (1 diff)
- trunk/app/views/admin/pages/new.html.erb (modified) (1 diff)
- trunk/app/views/admin/pages/_form.html.erb (modified) (1 diff)
- trunk/app/views/admin/pages/_pages.html.erb (modified) (1 diff)
- trunk/lang/fr_FR.rb (modified) (10 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/app/controllers/accounts_controller.rb
r1611 r1634 9 9 session[:user_id] = user.id 10 10 11 flash[:notice] = "Login successful"11 flash[:notice] = _("Login successful") 12 12 cookies[:is_admin] = "yes" 13 13 redirect_back_or_default :controller => "admin/dashboard", :action => "index" 14 14 else 15 flash.now[:notice] = "Login unsuccessful"15 flash.now[:notice] = _("Login unsuccessful") 16 16 17 17 @login = params[:user_login] … … 30 30 if request.post? and @user.save 31 31 session[:user_id] = @user.id 32 flash[:notice] = "Signup successful"32 flash[:notice] = _("Signup successful") 33 33 redirect_to :controller => "admin/settings", :action => "index" 34 34 return trunk/app/views/accounts/logout.html.erb
r1557 r1634 1 1 <div title="Account login" id="loginform"> 2 <%= content_tag :h3, link_to(image_tag("/images/admin/typologo.png", :alt=>"Typo website", :style => "height: 24px"), "http://typosphere.org") + _(" Signup") %>2 <%= content_tag :h3, link_to(image_tag("/images/admin/typologo.png", :alt=>"Typo website", :style => "height: 24px"), "http://typosphere.org") + _("Login") %> 3 3 <div class="form admin"> 4 4 trunk/app/views/admin/categories/list.html.erb
r1552 r1634 2 2 3 3 <% content_for('tasks') do -%> 4 <%= subtab _("Posts"), "", {:controller=>"content", :action=>"list"} %> 5 <%= subtab _("Pages"), "", {:controller=>"pages", :action=>"list"} %> 6 <%= subtab _("Categories"), "current", {:controller=>"categories", :action=>"index"} %> 7 <%= subtab _("Uploads"), "", {:controller=>"resources", :action=>"list"} %> 8 <%= content_tag :li, link_to_remote(_('Reorder'), :update => 'category_container', :url => { :action => 'reorder' }) %> 9 <%= content_tag :li, link_to_remote(_('Sort alphabetically'), :update => 'category_container', :url => { :action => 'asort' }) %> 4 <%= subtab _("Manage posts"), "", {:controller=>"content", :action=>"list"} %> 5 <%= subtab _("Manage pages"), "", {:controller=>"pages", :action=>"list"} %> 6 <%= subtab _("Manage categories"), "current", {:controller=>"categories", :action=>"index"} %> 7 <%= subtab _("Manage uploads"), "", {:controller=>"resources", :action=>"list"} %> 10 8 <% end -%> 11 9 … … 17 15 <%= render :partial => 'categories' %> 18 16 </div> 17 18 <div class="paginate"> 19 <%= link_to_remote(_('Reorder'), :update => 'category_container', :url => { :action => 'reorder' }) %> | 20 <%= link_to_remote(_('Sort alphabetically'), :update => 'category_container', :url => { :action => 'asort' }) %> 21 </div> trunk/app/views/admin/content/list.html.erb
r1556 r1634 1 <% @page_heading = _(' Posts') %>1 <% @page_heading = _('Manage posts') %> 2 2 3 3 <% content_for('tasks') do %> 4 <%= subtab _(" Posts"), "current", {:controller=>"content", :action=>"list"} %>5 <%= subtab _(" Pages"), "", {:controller=>"pages", :action=>"list"} %>6 <%= subtab _(" Categories"), "", {:controller=>"categories", :action=>"index"} %>7 <%= subtab _(" Uploads"), "", {:controller=>"resources", :action=>"list"} %>4 <%= subtab _("Manage posts"), "current", {:controller=>"content", :action=>"list"} %> 5 <%= subtab _("Manage pages"), "", {:controller=>"pages", :action=>"list"} %> 6 <%= subtab _("Manage categories"), "", {:controller=>"categories", :action=>"index"} %> 7 <%= subtab _("Manage uploads"), "", {:controller=>"resources", :action=>"list"} %> 8 8 <% end %> 9 9 <div id="quick-navigate" style="display:none;position:absolute;"> trunk/app/views/admin/content/new.html.erb
r1558 r1634 1 1 <% content_for('tasks') do %> 2 <%= subtab _("Write Post"), "current", {:controller=>"content", :action=>"new"} %>3 <%= subtab _("Write Page"), "", {:controller=>"pages", :action=>"new"} %>2 <%= subtab _("Write a post"), "current", {:controller=>"content", :action=>"new"} %> 3 <%= subtab _("Write a page"), "", {:controller=>"pages", :action=>"new"} %> 4 4 <% end %> 5 5 trunk/app/views/admin/content/_articles.html.erb
r1609 r1634 6 6 <th><%= order_link "Date", 'admin/content', 'list', 'created_at' %></th> 7 7 <th><%= _("Author")%></th> 8 <th><%= order_link "Published", 'admin/content', 'list', 'state' %></th>8 <th><%= order_link _("Ãtat"), 'admin/content', 'list', 'state' %></th> 9 9 <th><%= _("View")%></th> 10 10 <th><%= _("Edit")%></th> trunk/app/views/admin/content/_form.html.erb
r1587 r1634 69 69 <% end %> 70 70 <li> 71 <label for="article_published" class="float"><%= _(" Published")%>:</label>71 <label for="article_published" class="float"><%= _("Online")%>:</label> 72 72 <%= check_box 'article', 'published' %> 73 73 </li> trunk/app/views/admin/dashboard/index.html.erb
r1619 r1634 7 7 <ul> 8 8 <%= content_tag :li, link_to(_('Write a post'), :controller => 'content', :action => 'new') -%> 9 <%= content_tag :li, link_to(_('Write a page'), :controller => 'page', :action => 'new') -%> 9 10 <%= content_tag :li, link_to(_("Update your profile or change your password"), 10 11 :controller => 'users', :action => 'edit', :id => session[:user_id]) -%> … … 35 36 <ul> 36 37 <% if @recent_posts.size == 0 %> 37 <li> No posts yet, why don't you start and <%= link_to "write one", :controller => 'content', :action => 'new' %> ?</li>38 <li> <%= link_to _("No posts yet, why don't you start and write one"), :controller => 'content', :action => 'new' %> ?</li> 38 39 <% else %> 39 40 <% for post in @recent_posts -%> … … 50 51 <ul> 51 52 <% if @bestof.size == 0 %> 52 <li> Nothing to show yet!</li>53 <li><%= _("Nothing to show yet") %> !</li> 53 54 <% else %> 54 55 <% for article in @bestof -%> trunk/app/views/admin/pages/list.html.erb
r1552 r1634 1 <% @page_heading = _(' Pages') %>1 <% @page_heading = _('Manage pages') %> 2 2 3 3 <% content_for('tasks') do %> 4 <%= subtab _(" Posts"), "", {:controller=>"content", :action=>"list"} %>5 <%= subtab _(" Pages"), "current", {:controller=>"pages", :action=>"list"} %>6 <%= subtab _(" Categories"), "", {:controller=>"categories", :action=>"index"} %>7 <%= subtab _(" Uploads"), "", {:controller=>"resources", :action=>"list"} %>4 <%= subtab _("Manage posts"), "", {:controller=>"content", :action=>"list"} %> 5 <%= subtab _("Manage pages"), "current", {:controller=>"pages", :action=>"list"} %> 6 <%= subtab _("Manage categories"), "", {:controller=>"categories", :action=>"index"} %> 7 <%= subtab _("Manage uploads"), "", {:controller=>"resources", :action=>"list"} %> 8 8 <% end %> 9 9 trunk/app/views/admin/pages/new.html.erb
r1552 r1634 1 1 <% content_for('tasks') do %> 2 <%= subtab _("Write Post"), "", {:controller=>"content", :action=>"new"} %>3 <%= subtab _("Write Page"), "current", {:controller=>"pages", :action=>"new"} %>2 <%= subtab _("Write a post"), "", {:controller=>"content", :action=>"new"} %> 3 <%= subtab _("Write a page"), "current", {:controller=>"pages", :action=>"new"} %> 4 4 <% end %> 5 5 trunk/app/views/admin/pages/_form.html.erb
r1558 r1634 32 32 </li> 33 33 <li> 34 <label for="page_published" class="float"><%= _(" Published")%>:</label>34 <label for="page_published" class="float"><%= _("Online")%>:</label> 35 35 <%= check_box 'page', 'published' %> 36 36 </li> trunk/app/views/admin/pages/_pages.html.erb
r1556 r1634 5 5 <th><%= order_link "Date", 'admin/pages', 'list', 'created_at' %></th> 6 6 <th><%= _("Author")%></th> 7 <th><%= order_link "Published", 'admin/pages', 'list', 'state' %></th>7 <th><%= order_link _("Status"), 'admin/pages', 'list', 'state' %></th> 8 8 <th><%= _("View")%></th> 9 9 <th><%= _("Edit")%></th> trunk/lang/fr_FR.rb
r1587 r1634 6 6 l.store "Manage", "Gérer" 7 7 l.store "Feedback", "Commentaires" 8 l.store "Design", "Personnaliser" 8 l.store "Themes", "ThÚmes" 9 l.store "Plugins", "Greffons" 9 10 l.store "Users", ["Utilisateur", "Utilisateurs"] 10 11 l.store "Settings", "Configuration" 11 12 l.store "Things you can do", "Vous pouvez" 12 l.store "with %s Famfamfam iconset %s", "avec %s les icÃŽnes Famfamfam %s" 13 14 #admin/login.rhtml 13 l.store "with %s AER OS XK iconset iconset %s", "avec %s les icÃŽnes AER OS XK iconset %s" 14 15 #accounts/login.rhtml 16 l.store "Administration", "Administration" 15 17 l.store "Username", "Identifiant" 16 18 l.store "Password", "Mot de passe" 17 19 l.store "Login", "Connexion" 18 l.store "Back to the blog", "Retour à votre blog" 20 l.store "Back to ", "Revenir à " 21 l.store "Login unsuccessful", "Ãchec de la connexion" 22 l.store "Login successful", "Connexion réussie" 19 23 20 24 # admin/logout.rhtml 21 l.store "You are now logged out of the system", "Vous êtes maintenant déconnecté" 22 l.store "Do you want to go to your blog?", "Souhaitez-vous retourner sur votre blog ?" 23 l.store "Logoff", "Déconnexion" 25 l.store "Successfully logged out", "Vous êtes maintenant déconnecté" 24 26 25 27 # admin/signup.rhtml … … 30 32 l.store "Choose password", "Mot de passe" 31 33 l.store "Confirm password", "Confirmez le mot de passe" 34 l.store "Signup successful", "Inscription réussie" 32 35 33 36 # admin/dashboard/index.rhtml 34 37 l.store "What can you do ?", "Vous pouvez" 35 l.store "Write Post", "Ãcrire Billet"36 l.store "Write Page", "Ãcrire Page"38 l.store "Write a post", "Ãcrire un billet" 39 l.store "Write a page", "Ãcrire une page" 37 40 l.store "Update your profile or change your password", "Mettre votre profil à jour ou changer votre mot de passe" 38 l.store "Change you blog presentation", "Changer l'apparence de votre blog"41 l.store "Change your blog presentation", "Changer l'apparence de votre blog" 39 42 l.store "Enable plugins", "Ajouter des greffons" 40 43 l.store "Last Comments", "Derniers commentaires" 41 44 l.store "Last posts", "Derniers billets" 42 45 l.store "Most popular", "Billets les plus populaires" 43 l.store "Typo documentation", " Documentation officielle de Typo"46 l.store "Typo documentation", "Accéder à la documentation officielle de Typo" 44 47 l.store "No comments yet", "Aucun commentaire" 48 l.store "Nothing to show yet", "Rien à déclarer" 49 l.store "No posts yet, why don't you start and write one", "Vous n'avez encore écrit aucun billet, pourquoi ne pas commencer par là " 45 50 46 51 #admin/base/recent_comments.rhtml … … 109 114 l.store "Sort alphabetically", "Trier par ordre alphabétique" 110 115 l.store "Manage Articles", "Gérer les billets" 111 l.store "Manage Pages", "Gérer les pages statiques"116 l.store "Manage Pages", "Gérer les pages" 112 117 l.store "Manage Resources", "Gérer les ressources" 113 118 … … 142 147 l.store "Creating comment", "Ajouter un commentaire" 143 148 144 #admin/content/_articles.rhtml 145 l.store "Posts", "Billets" 146 l.store "Uploads", "Fichier uploadé" 149 #admin/content/list.rhtml 150 l.store "Manage posts", "Administrer les billets" 151 l.store "Manage uploads", "Administrer les piÚces jointes" 152 l.store "Manage categories", "Administrer les catégories" 153 l.store "Manage pages", "Administrer les pages" 147 154 l.store "Post title", "Titre du billet" 148 155 l.store "Posted at", "Date de publication" … … 155 162 l.store "no trackbacks", "aucun rétrolien" 156 163 l.store "no comments", "aucun commentaire" 157 164 l.store "Posts", "Billets" 158 165 #admin/content/_attachment.rhtml 159 166 l.store "Remove", "Supprimer" … … 164 171 l.store "Article Body", "Corps du billet" 165 172 l.store "Post", "Contenu" 166 l.store "Optional extended content", "Contenu étendu optionnel" 167 l.store "Optional Extended Content", "Contenu Ãtendu Optionnel" 173 l.store "Optional extended content", "Contenu étendu (optionnel)" 168 174 l.store "Article Content", "Contenu du billet" 169 175 l.store "Extended Content", "Contenu étendu" 170 176 l.store "Tags", ["Mot clé", "Mots clé"] 171 l.store "Save", " Enregistrer"177 l.store "Save", "Sauver" 172 178 l.store "Article Attachments", "PiÚces Jointes" 173 179 l.store "Article Options", "Options du billet" … … 175 181 l.store "Allow comments", "Autoriser les commentaires" 176 182 l.store "Allow trackbacks", "Autoriser les rétroliens" 177 l.store " Published", "Publié"183 l.store "Online", "En ligne" 178 184 l.store "Publish at", "Publié le" 179 185 l.store "Textfilter", "Formatage du texte" … … 200 206 l.store "Edit Article", "Ãditer un billet" 201 207 l.store "View article on your blog", "Voir ce billet sur votre blog" 202 203 #admin/content/new.rhtml204 l.store "Write a Page", "Ãcrire une page statique"205 l.store "Write an Article", "Ãcrire un billet"206 208 207 209 #admin/content/preview.rhtml … … 323 325 #admin/pages/_pages.rhtml 324 326 l.store "Action", "Actions" 325 l.store "Pages"," Pages statiques"327 l.store "Pages","Gérer les pages" 326 328 l.store "Show this page", "Afficher cette page" 327 329 l.store "Are you sure you want to delete the page", "Voulez-vous vraiment effacer cette page" … … 520 522 #vendor/plugins/archives_sidebar/views/content.rb 521 523 l.store "Archives", "Archives" 522 523 #vendor/plugins/tags_sidebar/views/content.rb 524 l.store "Tags", "Tags" 525 524 526 525 #app/helpers/admin/base_helper.rb 527 526 l.store "Back to overview", "Revenir à la liste"
