Mercurial > kallithea
changeset 3565:a8f2d78d14ea beta
consistently capitalize initial letter in flash messages
line wrap: on
line diff
--- a/rhodecode/controllers/admin/defaults.py Sun Mar 24 02:57:54 2013 +0100 +++ b/rhodecode/controllers/admin/defaults.py Wed Mar 20 12:16:58 2013 +0100 @@ -107,7 +107,7 @@ encoding="UTF-8") except Exception: log.error(traceback.format_exc()) - h.flash(_('error occurred during update of defaults'), + h.flash(_('Error occurred during update of defaults'), category='error') return redirect(url('defaults'))
--- a/rhodecode/controllers/admin/ldap_settings.py Sun Mar 24 02:57:54 2013 +0100 +++ b/rhodecode/controllers/admin/ldap_settings.py Wed Mar 20 12:16:58 2013 +0100 @@ -123,7 +123,7 @@ Session().add(setting) Session().commit() - h.flash(_('Ldap settings updated successfully'), + h.flash(_('LDAP settings updated successfully'), category='success') if not ldap_active: #if ldap is missing send an info to user @@ -144,7 +144,7 @@ encoding="UTF-8") except Exception: log.error(traceback.format_exc()) - h.flash(_('error occurred during update of ldap settings'), + h.flash(_('Error occurred during update of ldap settings'), category='error') return redirect(url('ldap_home'))
--- a/rhodecode/controllers/admin/permissions.py Sun Mar 24 02:57:54 2013 +0100 +++ b/rhodecode/controllers/admin/permissions.py Wed Mar 20 12:16:58 2013 +0100 @@ -139,7 +139,7 @@ encoding="UTF-8") except Exception: log.error(traceback.format_exc()) - h.flash(_('error occurred during update of permissions'), + h.flash(_('Error occurred during update of permissions'), category='error') return redirect(url('edit_permission', id=id))
--- a/rhodecode/controllers/admin/repos.py Sun Mar 24 02:57:54 2013 +0100 +++ b/rhodecode/controllers/admin/repos.py Wed Mar 20 12:16:58 2013 +0100 @@ -164,13 +164,13 @@ new_repo = RepoModel().create(form_result, self.rhodecode_user.user_id) if form_result['clone_uri']: - h.flash(_('created repository %s from %s') \ + h.flash(_('Created repository %s from %s') \ % (form_result['repo_name'], form_result['clone_uri']), category='success') else: repo_url = h.link_to(form_result['repo_name'], h.url('summary_home', repo_name=form_result['repo_name'])) - h.flash(h.literal(_('created repository %s') % repo_url), + h.flash(h.literal(_('Created repository %s') % repo_url), category='success') if request.POST.get('user_created'): @@ -269,7 +269,7 @@ except Exception: log.error(traceback.format_exc()) - h.flash(_('error occurred during update of repository %s') \ + h.flash(_('Error occurred during update of repository %s') \ % repo_name, category='error') return redirect(url('edit_repo', repo_name=changed_name)) @@ -298,17 +298,17 @@ log.debug('Detaching fork %s from repo %s' % (r, repo)) r.fork = None Session().add(r) - h.flash(_('detached %s forks') % _forks, category='success') + h.flash(_('Detached %s forks') % _forks, category='success') elif do == 'delete_forks': for r in repo.forks: log.debug('Deleting fork %s of repo %s' % (r, repo)) repo_model.delete(r) - h.flash(_('deleted %s forks') % _forks, category='success') + h.flash(_('Deleted %s forks') % _forks, category='success') action_logger(self.rhodecode_user, 'admin_deleted_repo', repo_name, self.ip_addr, self.sa) repo_model.delete(repo) invalidate_cache('get_repo_cached_%s' % repo_name) - h.flash(_('deleted repository %s') % repo_name, category='success') + h.flash(_('Deleted repository %s') % repo_name, category='success') Session().commit() except IntegrityError, e: if e.message.find('repositories_fork_id_fkey') != -1:
--- a/rhodecode/controllers/admin/repos_groups.py Sun Mar 24 02:57:54 2013 +0100 +++ b/rhodecode/controllers/admin/repos_groups.py Wed Mar 20 12:16:58 2013 +0100 @@ -142,7 +142,7 @@ owner=self.rhodecode_user.user_id ) Session().commit() - h.flash(_('created repos group %s') \ + h.flash(_('Created repos group %s') \ % form_result['group_name'], category='success') #TODO: in futureaction_logger(, '', '', '', self.sa) except formencode.Invalid, errors: @@ -154,7 +154,7 @@ encoding="UTF-8") except Exception: log.error(traceback.format_exc()) - h.flash(_('error occurred during creation of repos group %s') \ + h.flash(_('Error occurred during creation of repos group %s') \ % request.POST.get('group_name'), category='error') parent_group_id = form_result['group_parent_id'] #TODO: maybe we should get back to the main view, not the admin one @@ -217,7 +217,7 @@ new_gr = ReposGroupModel().update(group_name, form_result) Session().commit() - h.flash(_('updated repos group %s') \ + h.flash(_('Updated repos group %s') \ % form_result['group_name'], category='success') # we now have new name ! group_name = new_gr.group_name @@ -232,7 +232,7 @@ encoding="UTF-8") except Exception: log.error(traceback.format_exc()) - h.flash(_('error occurred during update of repos group %s') \ + h.flash(_('Error occurred during update of repos group %s') \ % request.POST.get('group_name'), category='error') return redirect(url('edit_repos_group', group_name=group_name)) @@ -263,12 +263,12 @@ try: ReposGroupModel().delete(group_name) Session().commit() - h.flash(_('removed repos group %s') % group_name, + h.flash(_('Removed repos group %s') % group_name, category='success') #TODO: in future action_logger(, '', '', '', self.sa) except Exception: log.error(traceback.format_exc()) - h.flash(_('error occurred during deletion of repos ' + h.flash(_('Error occurred during deletion of repos ' 'group %s') % group_name, category='error') return redirect(url('repos_groups'))
--- a/rhodecode/controllers/admin/settings.py Sun Mar 24 02:57:54 2013 +0100 +++ b/rhodecode/controllers/admin/settings.py Wed Mar 20 12:16:58 2013 +0100 @@ -167,7 +167,7 @@ except Exception: log.error(traceback.format_exc()) - h.flash(_('error occurred during updating ' + h.flash(_('Error occurred during updating ' 'application settings'), category='error') @@ -218,7 +218,7 @@ except Exception: log.error(traceback.format_exc()) - h.flash(_('error occurred during updating ' + h.flash(_('Error occurred during updating ' 'visualisation settings'), category='error') @@ -305,7 +305,7 @@ except Exception: log.error(traceback.format_exc()) - h.flash(_('error occurred during updating ' + h.flash(_('Error occurred during updating ' 'application settings'), category='error') if setting_id == 'hooks': @@ -331,7 +331,7 @@ Session().commit() except Exception: log.error(traceback.format_exc()) - h.flash(_('error occurred during hook creation'), + h.flash(_('Error occurred during hook creation'), category='error') return redirect(url('admin_edit_setting', setting_id='hooks')) @@ -471,7 +471,7 @@ return render('admin/users/user_edit_my_account.html') except Exception: log.error(traceback.format_exc()) - h.flash(_('error occurred during update of user %s') \ + h.flash(_('Error occurred during update of user %s') \ % form_result.get('username'), category='error') return redirect(url('my_account'))
--- a/rhodecode/controllers/admin/users.py Sun Mar 24 02:57:54 2013 +0100 +++ b/rhodecode/controllers/admin/users.py Wed Mar 20 12:16:58 2013 +0100 @@ -127,7 +127,7 @@ usr = form_result['username'] action_logger(self.rhodecode_user, 'admin_created_user:%s' % usr, None, self.ip_addr, self.sa) - h.flash(_('created user %s') % usr, + h.flash(_('Created user %s') % usr, category='success') Session().commit() except formencode.Invalid, errors: @@ -139,7 +139,7 @@ encoding="UTF-8") except Exception: log.error(traceback.format_exc()) - h.flash(_('error occurred during creation of user %s') \ + h.flash(_('Error occurred during creation of user %s') \ % request.POST.get('username'), category='error') return redirect(url('users')) @@ -195,7 +195,7 @@ encoding="UTF-8") except Exception: log.error(traceback.format_exc()) - h.flash(_('error occurred during update of user %s') \ + h.flash(_('Error occurred during update of user %s') \ % form_result.get('username'), category='error') return redirect(url('edit_user', id=id)) @@ -211,7 +211,7 @@ try: UserModel().delete(usr) Session().commit() - h.flash(_('successfully deleted user'), category='success') + h.flash(_('Successfully deleted user'), category='success') except (UserOwnsReposException, DefaultUserException), e: h.flash(e, category='warning') except Exception:
--- a/rhodecode/controllers/admin/users_groups.py Sun Mar 24 02:57:54 2013 +0100 +++ b/rhodecode/controllers/admin/users_groups.py Wed Mar 20 12:16:58 2013 +0100 @@ -83,7 +83,7 @@ action_logger(self.rhodecode_user, 'admin_created_users_group:%s' % gr, None, self.ip_addr, self.sa) - h.flash(_('created user group %s') % gr, category='success') + h.flash(_('Created user group %s') % gr, category='success') Session().commit() except formencode.Invalid, errors: return htmlfill.render( @@ -94,7 +94,7 @@ encoding="UTF-8") except Exception: log.error(traceback.format_exc()) - h.flash(_('error occurred during creation of user group %s') \ + h.flash(_('Error occurred during creation of user group %s') \ % request.POST.get('users_group_name'), category='error') return redirect(url('users_groups')) @@ -161,7 +161,7 @@ action_logger(self.rhodecode_user, 'admin_updated_users_group:%s' % gr, None, self.ip_addr, self.sa) - h.flash(_('updated user group %s') % gr, category='success') + h.flash(_('Updated user group %s') % gr, category='success') Session().commit() except formencode.Invalid, errors: ug_model = UserGroupModel() @@ -183,7 +183,7 @@ encoding="UTF-8") except Exception: log.error(traceback.format_exc()) - h.flash(_('error occurred during update of user group %s') \ + h.flash(_('Error occurred during update of user group %s') \ % request.POST.get('users_group_name'), category='error') return redirect(url('edit_users_group', id=id)) @@ -200,7 +200,7 @@ try: UserGroupModel().delete(usr_gr) Session().commit() - h.flash(_('successfully deleted user group'), category='success') + h.flash(_('Successfully deleted user group'), category='success') except UserGroupsAssignedException, e: h.flash(e, category='error') except Exception:
--- a/rhodecode/controllers/forks.py Sun Mar 24 02:57:54 2013 +0100 +++ b/rhodecode/controllers/forks.py Wed Mar 20 12:16:58 2013 +0100 @@ -165,7 +165,7 @@ fork_url = h.link_to(form_result['repo_name'], h.url('summary_home', repo_name=form_result['repo_name_full'])) - h.flash(h.literal(_('forked repository %s as %s') \ + h.flash(h.literal(_('Forked repository %s as %s') \ % (repo_name, fork_url)), category='success') except formencode.Invalid, errors:
--- a/rhodecode/controllers/settings.py Sun Mar 24 02:57:54 2013 +0100 +++ b/rhodecode/controllers/settings.py Wed Mar 20 12:16:58 2013 +0100 @@ -138,7 +138,7 @@ except Exception: log.error(traceback.format_exc()) - h.flash(_('error occurred during update of repository %s') \ + h.flash(_('Error occurred during update of repository %s') \ % repo_name, category='error') return redirect(url('repo_settings_home', repo_name=changed_name)) @@ -163,7 +163,7 @@ repo_name, self.ip_addr, self.sa) repo_model.delete(repo) invalidate_cache('get_repo_cached_%s' % repo_name) - h.flash(_('deleted repository %s') % repo_name, category='success') + h.flash(_('Deleted repository %s') % repo_name, category='success') Session().commit() except Exception: log.error(traceback.format_exc())
--- a/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po Sun Mar 24 02:57:54 2013 +0100 +++ b/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po Wed Mar 20 12:16:58 2013 +0100 @@ -362,7 +362,7 @@ msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:126 -msgid "Ldap settings updated successfully" +msgid "LDAP settings updated successfully" msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:130
--- a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po Sun Mar 24 02:57:54 2013 +0100 +++ b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po Wed Mar 20 12:16:58 2013 +0100 @@ -376,7 +376,7 @@ msgstr "START_TLS à la connexion" #: rhodecode/controllers/admin/ldap_settings.py:126 -msgid "Ldap settings updated successfully" +msgid "LDAP settings updated successfully" msgstr "Mise à jour réussie des réglages LDAP" #: rhodecode/controllers/admin/ldap_settings.py:130
--- a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po Sun Mar 24 02:57:54 2013 +0100 +++ b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po Wed Mar 20 12:16:58 2013 +0100 @@ -368,7 +368,7 @@ msgstr "LDAP接続でSTART_TLSを使用" #: rhodecode/controllers/admin/ldap_settings.py:126 -msgid "Ldap settings updated successfully" +msgid "LDAP settings updated successfully" msgstr "LDAP設定を更新しました" #: rhodecode/controllers/admin/ldap_settings.py:130
--- a/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po Sun Mar 24 02:57:54 2013 +0100 +++ b/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po Wed Mar 20 12:16:58 2013 +0100 @@ -374,7 +374,7 @@ msgstr "START_TLS dla połączenia LDAP" #: rhodecode/controllers/admin/ldap_settings.py:126 -msgid "Ldap settings updated successfully" +msgid "LDAP settings updated successfully" msgstr "Ustawienia LDAP zostały zaktualizowane" #: rhodecode/controllers/admin/ldap_settings.py:130
--- a/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po Sun Mar 24 02:57:54 2013 +0100 +++ b/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po Wed Mar 20 12:16:58 2013 +0100 @@ -382,7 +382,7 @@ msgstr "START_TLS na conexão LDAP" #: rhodecode/controllers/admin/ldap_settings.py:126 -msgid "Ldap settings updated successfully" +msgid "LDAP settings updated successfully" msgstr "Configurações de LDAP atualizadas com sucesso" #: rhodecode/controllers/admin/ldap_settings.py:130
--- a/rhodecode/i18n/rhodecode.pot Sun Mar 24 02:57:54 2013 +0100 +++ b/rhodecode/i18n/rhodecode.pot Wed Mar 20 12:16:58 2013 +0100 @@ -353,7 +353,7 @@ msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:126 -msgid "Ldap settings updated successfully" +msgid "LDAP settings updated successfully" msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:130
--- a/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po Sun Mar 24 02:57:54 2013 +0100 +++ b/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po Wed Mar 20 12:16:58 2013 +0100 @@ -365,7 +365,7 @@ msgstr "LDAP连接上的START_TLS" #: rhodecode/controllers/admin/ldap_settings.py:126 -msgid "Ldap settings updated successfully" +msgid "LDAP settings updated successfully" msgstr "LDAP设置已经成功更新" #: rhodecode/controllers/admin/ldap_settings.py:130
--- a/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po Sun Mar 24 02:57:54 2013 +0100 +++ b/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po Wed Mar 20 12:16:58 2013 +0100 @@ -376,7 +376,7 @@ msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:126 -msgid "Ldap settings updated successfully" +msgid "LDAP settings updated successfully" msgstr "LDAP設定更新完成" #: rhodecode/controllers/admin/ldap_settings.py:130
--- a/rhodecode/templates/forks/fork.html Sun Mar 24 02:57:54 2013 +0100 +++ b/rhodecode/templates/forks/fork.html Wed Mar 20 12:16:58 2013 +0100 @@ -91,7 +91,7 @@ </div> </div> <div class="buttons"> - ${h.submit('',_('fork this repository'),class_="ui-btn large")} + ${h.submit('',_('Fork this repository'),class_="ui-btn large")} </div> </div> </div>
--- a/rhodecode/tests/functional/test_admin_ldap_settings.py Sun Mar 24 02:57:54 2013 +0100 +++ b/rhodecode/tests/functional/test_admin_ldap_settings.py Wed Mar 20 12:16:58 2013 +0100 @@ -47,7 +47,7 @@ 'fail db write compare') self.checkSessionFlash(response, - 'Ldap settings updated successfully') + 'LDAP settings updated successfully') def test_ldap_error_form(self): self.log_user()
--- a/rhodecode/tests/functional/test_admin_repos.py Sun Mar 24 02:57:54 2013 +0100 +++ b/rhodecode/tests/functional/test_admin_repos.py Wed Mar 20 12:16:58 2013 +0100 @@ -32,7 +32,7 @@ repo_name=repo_name, repo_description=description)) self.checkSessionFlash(response, - 'created repository <a href="/%s">%s</a>' + 'Created repository <a href="/%s">%s</a>' % (repo_name, repo_name)) #test if the repo was created in the database @@ -66,7 +66,7 @@ repo_name=repo_name, repo_description=description)) self.checkSessionFlash(response, - u'created repository <a href="/%s">%s</a>' + u'Created repository <a href="/%s">%s</a>' % (urllib.quote(repo_name), repo_name_unicode)) #test if the repo was created in the database new_repo = self.Session().query(Repository)\ @@ -106,7 +106,7 @@ repo_group=gr.group_id,)) self.checkSessionFlash(response, - 'created repository <a href="/%s">%s</a>' + 'Created repository <a href="/%s">%s</a>' % (repo_name, repo_name)) #test if the repo was created in the database new_repo = self.Session().query(Repository)\ @@ -143,7 +143,7 @@ repo_name=repo_name, repo_description=description)) self.checkSessionFlash(response, - 'created repository <a href="/%s">%s</a>' + 'Created repository <a href="/%s">%s</a>' % (repo_name, repo_name)) #test if the repo was created in the database @@ -179,7 +179,7 @@ repo_description=description)) self.checkSessionFlash(response, - u'created repository <a href="/%s">%s</a>' + u'Created repository <a href="/%s">%s</a>' % (urllib.quote(repo_name), repo_name_unicode)) #test if the repo was created in the database @@ -225,7 +225,7 @@ repo_description=description)) self.checkSessionFlash(response, - 'created repository <a href="/%s">%s</a>' + 'Created repository <a href="/%s">%s</a>' % (repo_name, repo_name)) #test if the repo was created in the database new_repo = self.Session().query(Repository)\ @@ -247,7 +247,7 @@ response = self.app.delete(url('repo', repo_name=repo_name)) - self.assertTrue('''deleted repository %s''' % (repo_name) in + self.assertTrue('''Deleted repository %s''' % (repo_name) in response.session['flash'][0]) response.follow() @@ -273,7 +273,7 @@ repo_description=description)) self.checkSessionFlash(response, - 'created repository <a href="/%s">%s</a>' + 'Created repository <a href="/%s">%s</a>' % (repo_name, repo_name)) #test if the repo was created in the database new_repo = self.Session().query(Repository)\ @@ -295,7 +295,7 @@ response = self.app.delete(url('repo', repo_name=repo_name)) - self.assertTrue('''deleted repository %s''' % (repo_name) in + self.assertTrue('''Deleted repository %s''' % (repo_name) in response.session['flash'][0]) response.follow()
--- a/rhodecode/tests/functional/test_admin_users.py Sun Mar 24 02:57:54 2013 +0100 +++ b/rhodecode/tests/functional/test_admin_users.py Wed Mar 20 12:16:58 2013 +0100 @@ -37,7 +37,7 @@ 'lastname': lastname, 'email': email}) - self.checkSessionFlash(response, '''created user %s''' % (username)) + self.checkSessionFlash(response, '''Created user %s''' % (username)) new_user = self.Session.query(User).\ filter(User.username == username).one() @@ -150,7 +150,7 @@ .filter(User.username == username).one() response = self.app.delete(url('user', id=new_user.user_id)) - self.assertTrue("""successfully deleted user""" in + self.assertTrue("""Successfully deleted user""" in response.session['flash'][0]) def test_delete_browser_fakeout(self):
--- a/rhodecode/tests/functional/test_admin_users_groups.py Sun Mar 24 02:57:54 2013 +0100 +++ b/rhodecode/tests/functional/test_admin_users_groups.py Wed Mar 20 12:16:58 2013 +0100 @@ -22,7 +22,7 @@ response.follow() self.checkSessionFlash(response, - 'created user group %s' % TEST_USER_GROUP) + 'Created user group %s' % TEST_USER_GROUP) def test_new(self): response = self.app.get(url('new_users_group')) @@ -46,7 +46,7 @@ response.follow() self.checkSessionFlash(response, - 'created user group %s' % users_group_name) + 'Created user group %s' % users_group_name) gr = self.Session.query(UserGroup)\ .filter(UserGroup.users_group_name == @@ -70,7 +70,7 @@ ug = UserGroup.get_by_group_name(users_group_name) self.checkSessionFlash(response, - 'created user group %s' % users_group_name) + 'Created user group %s' % users_group_name) ## ENABLE REPO CREATE ON A GROUP response = self.app.put(url('users_group_perm', id=ug.users_group_id), {'create_repo_perm': True}) @@ -139,7 +139,7 @@ ug = UserGroup.get_by_group_name(users_group_name) self.checkSessionFlash(response, - 'created user group %s' % users_group_name) + 'Created user group %s' % users_group_name) ## ENABLE REPO CREATE ON A GROUP response = self.app.put(url('users_group_perm', id=ug.users_group_id), {'fork_repo_perm': True})
--- a/rhodecode/tests/functional/test_forks.py Sun Mar 24 02:57:54 2013 +0100 +++ b/rhodecode/tests/functional/test_forks.py Wed Mar 20 12:16:58 2013 +0100 @@ -119,7 +119,7 @@ #test if we have a message that fork is ok self.checkSessionFlash(response, - 'forked repository %s as <a href="/%s">%s</a>' + 'Forked repository %s as <a href="/%s">%s</a>' % (repo_name, fork_name, fork_name)) #test if the fork was created in the database