jro_apps/redmine Commit - r666:39c9874a4102

0

app/controllers/my_controller.rb +12 -4

                  @pref = @user.pref
                  @user.attributes = params[:user]
                  @user.pref.attributes = params[:pref]
-                 if request.post? and @user.save and @user.pref.save
-                   set_localization
-                   flash.now[:notice] = l(:notice_account_updated)
-                   self.logged_in_user.reload
+                 if request.post? && @user.save && @user.pref.save
+                   flash[:notice] = l(:notice_account_updated)
+                   redirect_to :action => 'account'
                  end
                end
                  end
                  redirect_to :action => 'account'
                end
+               # Create a new feeds key
+               def reset_rss_key
+                 if request.post? && User.current.rss_token
+                   User.current.rss_token.destroy
+                   flash[:notice] = l(:notice_feeds_access_key_reseted)
+                 end
+                 redirect_to :action => 'account'
+               end
                # User's page layout configuration
                def page_layout

0

app/views/my/account.rhtml +7 -2

              <h2><%=l(:label_my_account)%></h2>
-             <p><%=l(:field_login)%>: <strong><%= @user.login %></strong><br />
-             <%=l(:field_created_on)%>: <%= format_time(@user.created_on) %></p>
+             <p><%=l(:field_login)%>: <strong><%= @user.login %></strong>
+             <br /><%=l(:field_created_on)%>: <%= format_time(@user.created_on) %>
+             <% if @user.rss_token %>
+             <br /><%= l(:label_feeds_access_key_created_on, distance_of_time_in_words(Time.now, @user.rss_token.created_on)) %>
+             (<%= link_to l(:button_reset), {:action => 'reset_rss_key'}, :method => :post %>)
+             <% end %>
+             </p>
              <%= error_messages_for 'user' %>

0

lang/bg.yml +4 -1

              notice_scm_error: Несъществуващ обект в склада.
              notice_not_authorized: Нямате право на достъп до тази страница.
              notice_email_sent: An email was sent to %s
-             notice_email_error: An error occurred while sending mail (%s)"
+             notice_email_error: An error occurred while sending mail (%s)
+             notice_feeds_access_key_reseted: Your RSS access key was reseted.
              mail_subject_lost_password: Вашата парола
              mail_subject_register: Активация на акаунт
              label_language_based: Language based
              label_sort_by: Sort by "%s"
              label_send_test_email: Send a test email
+             label_feeds_access_key_created_on: RSS access key created %s ago
              button_login: Вход
              button_submit: Изпращане
              button_reply: Reply
              button_archive: Archive
              button_unarchive: Unarchive
+             button_reset: Reset
              status_active: активен
              status_registered: регистриран

0

lang/de.yml +4 -1

              notice_scm_error: Eintrag und/oder Revision besteht nicht im Projektarchiv.
              notice_not_authorized: Sie sind nicht berechtigt auf diese Seite zuzugreifen.
              notice_email_sent: An email was sent to %s
-             notice_email_error: An error occurred while sending mail (%s)"
+             notice_email_error: An error occurred while sending mail (%s)
+             notice_feeds_access_key_reseted: Your RSS access key was reseted.
              mail_subject_lost_password: Ihr redMine Kennwort
              mail_subject_register: redMine Kontoaktivierung
              label_language_based: Language based
              label_sort_by: Sort by "%s"
              label_send_test_email: Send a test email
+             label_feeds_access_key_created_on: RSS access key created %s ago
              button_login: Einloggen
              button_submit: OK
              button_reply: Reply
              button_archive: Archive
              button_unarchive: Unarchive
+             button_reset: Reset
              status_active: aktiv
              status_registered: angemeldet

0

lang/en.yml +4 -1

              notice_scm_error: Entry and/or revision doesn't exist in the repository.
              notice_not_authorized: You are not authorized to access this page.
              notice_email_sent: An email was sent to %s
-             notice_email_error: An error occurred while sending mail (%s)"
+             notice_email_error: An error occurred while sending mail (%s)
+             notice_feeds_access_key_reseted: Your RSS access key was reseted.
              mail_subject_lost_password: Your redMine password
              mail_subject_register: redMine account activation
              label_language_based: Language based
              label_sort_by: Sort by "%s"
              label_send_test_email: Send a test email
+             label_feeds_access_key_created_on: RSS access key created %s ago
              button_login: Login
              button_submit: Submit
              button_reply: Reply
              button_archive: Archive
              button_unarchive: Unarchive
+             button_reset: Reset
              status_active: active
              status_registered: registered

0

lang/es.yml +4 -1

              notice_scm_error: La entrada y/o la revisión no existe en el depósito.
              notice_not_authorized: You are not authorized to access this page.
              notice_email_sent: An email was sent to %s
-             notice_email_error: An error occurred while sending mail (%s)"
+             notice_email_error: An error occurred while sending mail (%s)
+             notice_feeds_access_key_reseted: Your RSS access key was reseted.
              mail_subject_lost_password: Tu contraseña del redMine
              mail_subject_register: Activación de la cuenta del redMine
              label_language_based: Language based
              label_sort_by: Sort by "%s"
              label_send_test_email: Send a test email
+             label_feeds_access_key_created_on: RSS access key created %s ago
              button_login: Conexión
              button_submit: Someter
              button_reply: Reply
              button_archive: Archive
              button_unarchive: Unarchive
+             button_reset: Reset
              status_active: active
              status_registered: registered

0

lang/fr.yml +3 0

              notice_not_authorized: "Vous n'êtes pas autorisés à accéder à cette page."
              notice_email_sent: "Un email a été envoyé à %s"
              notice_email_error: "Erreur lors de l'envoi de l'email (%s)"
+             notice_feeds_access_key_reseted: Votre clé d'accès aux flux RSS a été réinitialisée.
              mail_subject_lost_password: Votre mot de passe redMine
              mail_subject_register: Activation de votre compte redMine
              label_language_based: Basé sur la langue
              label_sort_by: Trier par "%s"
              label_send_test_email: Envoyer un email de test
+             label_feeds_access_key_created_on: Clé d'accès RSS créée il y a %s
              button_login: Connexion
              button_submit: Soumettre
              button_reply: Répondre
              button_archive: Archiver
              button_unarchive: Désarchiver
+             button_reset: Réinitialiser
              status_active: actif
              status_registered: enregistré

0

lang/it.yml +4 -1

              notice_scm_error: La risorsa e/o la versione non esistono nel repository.
              notice_not_authorized: You are not authorized to access this page.
              notice_email_sent: An email was sent to %s
-             notice_email_error: An error occurred while sending mail (%s)"
+             notice_email_error: An error occurred while sending mail (%s)
+             notice_feeds_access_key_reseted: Your RSS access key was reseted.
              mail_subject_lost_password: Password redMine
              mail_subject_register: Attivazione utenza redMine
              label_language_based: Language based
              label_sort_by: Sort by "%s"
              label_send_test_email: Send a test email
+             label_feeds_access_key_created_on: RSS access key created %s ago
              button_login: Login
              button_submit: Invia
              button_reply: Reply
              button_archive: Archive
              button_unarchive: Unarchive
+             button_reset: Reset
              status_active: attivo
              status_registered: registrato

0

lang/ja.yml +4 -1

              notice_scm_error: リポジトリに、エントリ/リビジョンが存在しません。
              notice_not_authorized: このページにアクセスするには認証が必要です。
              notice_email_sent: An email was sent to %s
-             notice_email_error: An error occurred while sending mail (%s)"
+             notice_email_error: An error occurred while sending mail (%s)
+             notice_feeds_access_key_reseted: Your RSS access key was reseted.
              mail_subject_lost_password: redMineパスワード
              mail_subject_register: redMineアカウントが有効になりました
              label_language_based: Language based
              label_sort_by: Sort by "%s"
              label_send_test_email: Send a test email
+             label_feeds_access_key_created_on: RSS access key created %s ago
              button_login: ログイン
              button_submit: 変更
              button_reply: 返答
              button_archive: 書庫に保存
              button_unarchive: 書庫から戻す
+             button_reset: Reset
              status_active: 有効
              status_registered: 登録

0

lang/nl.yml +4 -1

              notice_scm_error: Deze ingang of revisie bestaat niet in de repository.
              notice_not_authorized: Het is U niet toegestaan om deze pagina te raadplegen.
              notice_email_sent: An email was sent to %s
-             notice_email_error: An error occurred while sending mail (%s)"
+             notice_email_error: An error occurred while sending mail (%s)
+             notice_feeds_access_key_reseted: Your RSS access key was reseted.
              mail_subject_lost_password: Uw redMine wachtwoord
              mail_subject_register: redMine account activatie
              label_language_based: Language based
              label_sort_by: Sort by "%s"
              label_send_test_email: Send a test email
+             label_feeds_access_key_created_on: RSS access key created %s ago
              button_login: Inloggen
              button_submit: Toevoegen
              button_reply: Antwoord
              button_archive: Archive
              button_unarchive: Unarchive
+             button_reset: Reset
              status_active: Actief
              status_registered: geregistreerd

0

lang/pt-br.yml +4 -1

              notice_scm_error: A entrada e/ou a revisao nao existem no repositorio.
              notice_not_authorized: You are not authorized to access this page.
              notice_email_sent: An email was sent to %s
-             notice_email_error: An error occurred while sending mail (%s)"
+             notice_email_error: An error occurred while sending mail (%s)
+             notice_feeds_access_key_reseted: Your RSS access key was reseted.
              mail_subject_lost_password: Sua senha do redMine.
              mail_subject_register: Ativacao de conta do redMine.
              label_language_based: Language based
              label_sort_by: Sort by "%s"
              label_send_test_email: Send a test email
+             label_feeds_access_key_created_on: RSS access key created %s ago
              button_login: Login
              button_submit: Enviar
              button_reply: Reply
              button_archive: Archive
              button_unarchive: Unarchive
+             button_reset: Reset
              status_active: ativo
              status_registered: registrado

0

lang/pt.yml +4 -1

              notice_scm_error: A entrada e/ou a revisão não existem no repositório.
              notice_not_authorized: Você não está autorizado a acessar esta página.
              notice_email_sent: An email was sent to %s
-             notice_email_error: An error occurred while sending mail (%s)"
+             notice_email_error: An error occurred while sending mail (%s)
+             notice_feeds_access_key_reseted: Your RSS access key was reseted.
              mail_subject_lost_password: Sua senha do redMine.
              mail_subject_register: Ativação de conta do redMine.
              label_language_based: Language based
              label_sort_by: Sort by "%s"
              label_send_test_email: Send a test email
+             label_feeds_access_key_created_on: RSS access key created %s ago
              button_login: Login
              button_submit: Enviar
              button_reply: Reply
              button_archive: Archive
              button_unarchive: Unarchive
+             button_reset: Reset
              status_active: ativo
              status_registered: registrado

0

lang/sv.yml +4 -1

              notice_scm_error: Inlägg och/eller revision finns inte i repositoriet.
              notice_not_authorized: You are not authorized to access this page.
              notice_email_sent: An email was sent to %s
-             notice_email_error: An error occurred while sending mail (%s)"
+             notice_email_error: An error occurred while sending mail (%s)
+             notice_feeds_access_key_reseted: Your RSS access key was reseted.
              mail_subject_lost_password: Ditt redMine lösenord
              mail_subject_register: redMine kontoaktivering
              label_language_based: Language based
              label_sort_by: Sort by "%s"
              label_send_test_email: Send a test email
+             label_feeds_access_key_created_on: RSS access key created %s ago
              button_login: Logga in
              button_submit: Skicka
              button_reply: Reply
              button_archive: Archive
              button_unarchive: Unarchive
+             button_reset: Reset
              status_active: activ
              status_registered: registrerad

0

lang/zh.yml +4 -1

              notice_scm_error: 在版本库中不存在该条目或修订
              notice_not_authorized: You are not authorized to access this page.
              notice_email_sent: An email was sent to %s
-             notice_email_error: An error occurred while sending mail (%s)"
+             notice_email_error: An error occurred while sending mail (%s)
+             notice_feeds_access_key_reseted: Your RSS access key was reseted.
              mail_subject_lost_password: 您的redMine口令
              mail_subject_register: redMine帐户激活
              label_language_based: Language based
              label_sort_by: Sort by "%s"
              label_send_test_email: Send a test email
+             label_feeds_access_key_created_on: RSS access key created %s ago
              button_login: 登录
              button_submit: 提交
              button_reply: Reply
              button_archive: Archive
              button_unarchive: Unarchive
+             button_reset: Reset
              status_active: 激活
              status_registered: 已注册

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages