0001-Introducing-a-configurable-length-of-the-short-proje.patch

Bernhard Furtmueller, 2009-09-22 14:10

Download (23.7 KB)

View differences:

app/helpers/projects_helper.rb
60 60
        classes = (ancestors.empty? ? 'root' : 'child')
61 61
        s << "<li class='#{classes}'><div class='#{classes}'>" +
62 62
               link_to(h(project), {:controller => 'projects', :action => 'show', :id => project}, :class => "project #{User.current.member_of?(project) ? 'my-project' : nil}")
63
        s << "<div class='wiki description'>#{textilizable(project.short_description, :project => project)}</div>" unless project.description.blank?
63
        s << "<div class='wiki description'>#{textilizable(project.short_description(Setting.short_desc_length), :project => project)}</div>" unless project.description.blank?
64 64
        s << "</div>\n"
65 65
        ancestors << project
66 66
      end
app/views/admin/projects.rhtml
27 27
<% for project in @projects %>
28 28
  <tr class="<%= cycle("odd", "even") %> <%= css_project_classes(project) %>">
29 29
	<td class="name" style="padding-left: <%= project.level %>em;"><%= project.active? ? link_to(h(project.name), :controller => 'projects', :action => 'settings', :id => project) : h(project.name) %></td>
30
	<td><%= textilizable project.short_description, :project => project %></td>
30
	<td><%= textilizable project.short_description(Setting.short_desc_length), :project => project %></td>
31 31
	<td align="center"><%= image_tag 'true.png' if project.is_public? %></td>
32 32
	<td align="center"><%= format_date(project.created_on) %></td>
33 33
  <td class="buttons">
app/views/settings/_general.rhtml
38 38

  
39 39
<p><label><%= l(:setting_diff_max_lines_displayed) %></label>
40 40
<%= text_field_tag 'settings[diff_max_lines_displayed]', Setting.diff_max_lines_displayed, :size => 6 %></p>
41

  
42
<p><label><%= l(:setting_short_desc_length) %></label>
43
<%= text_field_tag 'settings[short_desc_length]', Setting.short_desc_length, :size => 6 %></p>
41 44
</div>
42 45

  
43 46
<%= submit_tag l(:button_save) %>
app/views/welcome/index.rhtml
20 20
		<% for project in @projects %>
21 21
			<li>
22 22
			<%= link_to h(project.name), :controller => 'projects', :action => 'show', :id => project %> (<%= format_time(project.created_on) %>)
23
			<%= textilizable project.short_description, :project => project %>
23
			<%= textilizable project.short_description(Setting.short_desc_length), :project => project %>
24 24
			</li>
25 25
		<% end %>
26 26
		</ul>
config/locales/bg.yml
798 798
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
799 799
  permission_add_project: Create project
800 800
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
801
  setting_short_desc_length: Length of short project description
801 802
  label_view_all_revisions: View all revisions
802 803
  label_tag: Tag
803 804
  label_branch: Branch
config/locales/bs.yml
831 831
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
832 832
  permission_add_project: Create project
833 833
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
834
  setting_short_desc_length: Length of short project description
834 835
  label_view_all_revisions: View all revisions
835 836
  label_tag: Tag
836 837
  label_branch: Branch
config/locales/ca.yml
801 801
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
802 802
  permission_add_project: Create project
803 803
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
804
  setting_short_desc_length: Length of short project description
804 805
  label_view_all_revisions: View all revisions
805 806
  label_tag: Tag
806 807
  label_branch: Branch
config/locales/cs.yml
804 804
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
805 805
  permission_add_project: Create project
806 806
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
807
  setting_short_desc_length: Length of short project description
807 808
  label_view_all_revisions: View all revisions
808 809
  label_tag: Tag
809 810
  label_branch: Branch
config/locales/da.yml
831 831
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
832 832
  permission_add_project: Create project
833 833
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
834
  setting_short_desc_length: Length of short project description
834 835
  label_view_all_revisions: View all revisions
835 836
  label_tag: Tag
836 837
  label_branch: Branch
config/locales/de.yml
830 830
  mail_body_wiki_content_updated: "Die Wiki-Seite '{{page}}' wurde von {{author}} aktualisiert."
831 831
  permission_add_project: Erstelle Projekt
832 832
  setting_new_project_user_role_id: Rolle einem Nicht-Administrator zugeordnet, welcher ein Projekt erstellt
833
  setting_short_desc_length: Länge der gekürzten Projektbeschreibung
833 834
  label_view_all_revisions: View all revisions
834 835
  label_tag: Tag
835 836
  label_branch: Branch
config/locales/en.yml
294 294
  setting_openid: Allow OpenID login and registration
295 295
  setting_password_min_length: Minimum password length
296 296
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
297
  setting_short_desc_length: Length of short project description
297 298
  
298 299
  permission_add_project: Create project
299 300
  permission_edit_project: Edit project
config/locales/es.yml
851 851
  mail_body_wiki_content_updated: La página wiki '{{page}}' ha sido actualizada por {{author}}.
852 852
  permission_add_project: Crear proyecto
853 853
  setting_new_project_user_role_id: Permiso asignado a un usuario no-administrador para crear proyectos
854
  setting_short_desc_length: Length of short project description
854 855
  label_view_all_revisions: View all revisions
855 856
  label_tag: Tag
856 857
  label_branch: Branch
config/locales/fi.yml
841 841
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
842 842
  permission_add_project: Create project
843 843
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
844
  setting_short_desc_length: Length of short project description
844 845
  label_view_all_revisions: View all revisions
845 846
  label_tag: Tag
846 847
  label_branch: Branch
config/locales/fr.yml
324 324
  setting_openid: "Autoriser l'authentification et l'enregistrement OpenID"
325 325
  setting_password_min_length: Longueur minimum des mots de passe
326 326
  setting_new_project_user_role_id: Rôle donné à un utilisateur non-administrateur qui crée un projet
327
  setting_short_desc_length: Length of short project description
327 328
  
328 329
  permission_add_project: Créer un projet
329 330
  permission_edit_project: Modifier le projet
config/locales/gl.yml
830 830
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
831 831
  permission_add_project: Create project
832 832
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
833
  setting_short_desc_length: Length of short project description
833 834
  label_view_all_revisions: View all revisions
834 835
  label_tag: Tag
835 836
  label_branch: Branch
config/locales/he.yml
813 813
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
814 814
  permission_add_project: Create project
815 815
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
816
  setting_short_desc_length: Length of short project description
816 817
  label_view_all_revisions: View all revisions
817 818
  label_tag: Tag
818 819
  label_branch: Branch
config/locales/hu.yml
836 836
  mail_body_wiki_content_updated: A '{{page}}' wiki oldalt {{author}} frissítette.
837 837
  permission_add_project: Projekt létrehozása
838 838
  setting_new_project_user_role_id: Projekt létrehozási jog nem adminisztrátor felhasználóknak
839
  setting_short_desc_length: Length of short project description
839 840
  label_view_all_revisions: View all revisions
840 841
  label_tag: Tag
841 842
  label_branch: Branch
config/locales/it.yml
816 816
  mail_body_wiki_content_updated: La pagina '{{page}}' wiki è stata aggiornata da{{author}}.
817 817
  permission_add_project: Crea progetto
818 818
  setting_new_project_user_role_id: Ruolo assegnato agli utenti non amministratori che creano un progetto
819
  setting_short_desc_length: Length of short project description
819 820
  label_view_all_revisions: View all revisions
820 821
  label_tag: Tag
821 822
  label_branch: Branch
config/locales/ja.yml
329 329
  setting_openid: OpenIDによるログインと登録
330 330
  setting_password_min_length: パスワードの最低必要文字数
331 331
  setting_new_project_user_role_id: 管理者以外のユーザが作成したプロジェクトに設定するロール
332
  setting_short_desc_length: Length of short project description
332 333
  
333 334
  permission_add_project: プロジェクトの追加
334 335
  permission_edit_project: プロジェクトの編集
config/locales/ko.yml
355 355
  setting_openid: OpenID 로그인과 등록 허용
356 356
  setting_password_min_length: 최소 암호 길이
357 357
  setting_new_project_user_role_id: 프로젝트를 만든 일반사용자에게 주어질 권한
358
  setting_short_desc_length: Length of short project description
358 359

  
359 360
  permission_add_project: 프로젝트 생성
360 361
  permission_edit_project: 프로젝트 편집
config/locales/lt.yml
841 841
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
842 842
  permission_add_project: Create project
843 843
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
844
  setting_short_desc_length: Length of short project description
844 845
  label_view_all_revisions: View all revisions
845 846
  label_tag: Tag
846 847
  label_branch: Branch
config/locales/nl.yml
786 786
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
787 787
  permission_add_project: Create project
788 788
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
789
  setting_short_desc_length: Length of short project description
789 790
  label_view_all_revisions: View all revisions
790 791
  label_tag: Tag
791 792
  label_branch: Branch
config/locales/no.yml
803 803
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
804 804
  permission_add_project: Create project
805 805
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
806
  setting_short_desc_length: Length of short project description
806 807
  label_view_all_revisions: View all revisions
807 808
  label_tag: Tag
808 809
  label_branch: Branch
config/locales/pl.yml
834 834
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
835 835
  permission_add_project: Create project
836 836
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
837
  setting_short_desc_length: Length of short project description
837 838
  label_view_all_revisions: View all revisions
838 839
  label_tag: Tag
839 840
  label_branch: Branch
config/locales/pt-BR.yml
838 838
  mail_body_wiki_content_updated: A página wiki '{{page}}' foi atualizada por {{author}}.
839 839
  permission_add_project: Criar projeto
840 840
  setting_new_project_user_role_id: Papel dado a um usuário não administrador que crie um projeto
841
  setting_short_desc_length: Length of short project description
841 842
  label_view_all_revisions: Ver todas as revisões
842 843
  label_tag: Etiqueta
843 844
  label_branch: Ramo
config/locales/pt.yml
822 822
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
823 823
  permission_add_project: Create project
824 824
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
825
  setting_short_desc_length: Length of short project description
825 826
  label_view_all_revisions: View all revisions
826 827
  label_tag: Tag
827 828
  label_branch: Branch
config/locales/ro.yml
801 801
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
802 802
  permission_add_project: Create project
803 803
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
804
  setting_short_desc_length: Length of short project description
804 805
  label_view_all_revisions: View all revisions
805 806
  label_tag: Tag
806 807
  label_branch: Branch
config/locales/ru.yml
928 928
  mail_body_wiki_content_updated: "{{author}} обновил(а) wiki-страницу '{{page}}'."
929 929
  permission_add_project: Создание проекта
930 930
  setting_new_project_user_role_id: Роль, назначаемая пользователю, создавшему проект
931
  setting_short_desc_length: Length of short project description
931 932
  label_view_all_revisions: Показать все ревизии
932 933
  label_tag: Метка
933 934
  label_branch: Ветвь
config/locales/sk.yml
803 803
  mail_body_wiki_content_updated: Wiki stránka '{{page}}' bola aktualizovaná užívateľom {{author}}.
804 804
  setting_repositories_encodings: Kódovanie repozitára
805 805
  setting_new_project_user_role_id: Rola dána non-admin užívateľovi, ktorý vytvorí projekt
806
  setting_short_desc_length: Length of short project description
806 807
  label_view_all_revisions: View all revisions
807 808
  label_tag: Tag
808 809
  label_branch: Branch
config/locales/sl.yml
800 800
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
801 801
  permission_add_project: Create project
802 802
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
803
  setting_short_desc_length: Length of short project description
803 804
  label_view_all_revisions: View all revisions
804 805
  label_tag: Tag
805 806
  label_branch: Branch
config/locales/sr.yml
824 824
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
825 825
  permission_add_project: Create project
826 826
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
827
  setting_short_desc_length: Length of short project description
827 828
  label_view_all_revisions: View all revisions
828 829
  label_tag: Tag
829 830
  label_branch: Branch
config/locales/sv.yml
350 350
  setting_openid: Tillåt inloggning och registrering med OpenID
351 351
  setting_password_min_length: Minsta tillåtna lösenordslängd
352 352
  setting_new_project_user_role_id: Tilldelad roll för en icke-administratör som skapar ett projekt
353
  setting_short_desc_length: Length of short project description
353 354
  
354 355
  permission_add_project: Skapa projekt
355 356
  permission_edit_project: Ändra projekt
config/locales/th.yml
801 801
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
802 802
  permission_add_project: Create project
803 803
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
804
  setting_short_desc_length: Length of short project description
804 805
  label_view_all_revisions: View all revisions
805 806
  label_tag: Tag
806 807
  label_branch: Branch
config/locales/tr.yml
837 837
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
838 838
  permission_add_project: Create project
839 839
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
840
  setting_short_desc_length: Length of short project description
840 841
  label_view_all_revisions: View all revisions
841 842
  label_tag: Tag
842 843
  label_branch: Branch
config/locales/uk.yml
800 800
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
801 801
  permission_add_project: Create project
802 802
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
803
  setting_short_desc_length: Length of short project description
803 804
  label_view_all_revisions: View all revisions
804 805
  label_tag: Tag
805 806
  label_branch: Branch
config/locales/vi.yml
870 870
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
871 871
  permission_add_project: Create project
872 872
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
873
  setting_short_desc_length: Length of short project description
873 874
  label_view_all_revisions: View all revisions
874 875
  label_tag: Tag
875 876
  label_branch: Branch
config/locales/zh-TW.yml
399 399
  setting_openid: 允許使用 OpenID 登入與註冊
400 400
  setting_password_min_length: 密碼最小長度
401 401
  setting_new_project_user_role_id: 管理者以外之用戶建立新專案時,將被指派的角色
402
  setting_short_desc_length: Length of short project description
402 403
  
403 404
  permission_add_project: 建立專案
404 405
  permission_edit_project: 編輯專案
config/locales/zh.yml
324 324
  setting_openid: 允许使用OpenID登录和注册
325 325
  setting_password_min_length: 最短密码长度
326 326
  setting_new_project_user_role_id: 非管理员用户新建项目时将被赋予的(在该项目中的)角色
327
  setting_short_desc_length: Length of short project description
327 328

  
328 329
  permission_add_project: 新建项目
329 330
  permission_edit_project: 编辑项目
config/settings.yml
157 157
  default: 0
158 158
openid:
159 159
  default: 0
160
short_desc_length:
161
  default: 255
160
-