0001-Introducing-a-configurable-length-of-the-short-against-r2898.patch

New Patch against r2898 - Bernhard Furtmueller, 2009-09-23 08:46

Download (24.1 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
811 811
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
812 812
  permission_add_project: Create project
813 813
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
814
  setting_short_desc_length: Length of short project description
814 815
  label_view_all_revisions: View all revisions
815 816
  label_tag: Tag
816 817
  label_branch: Branch
config/locales/bs.yml
835 835
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
836 836
  permission_add_project: Create project
837 837
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
838
  setting_short_desc_length: Length of short project description
838 839
  label_view_all_revisions: View all revisions
839 840
  label_tag: Tag
840 841
  label_branch: Branch
config/locales/ca.yml
814 814
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
815 815
  permission_add_project: Create project
816 816
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
817
  setting_short_desc_length: Length of short project description
817 818
  label_view_all_revisions: View all revisions
818 819
  label_tag: Tag
819 820
  label_branch: Branch
config/locales/cs.yml
817 817
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
818 818
  permission_add_project: Create project
819 819
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
820
  setting_short_desc_length: Length of short project description
820 821
  label_view_all_revisions: View all revisions
821 822
  label_tag: Tag
822 823
  label_branch: Branch
config/locales/da.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/de.yml
837 837
  mail_body_wiki_content_updated: "Die Wiki-Seite '{{page}}' wurde von {{author}} aktualisiert."
838 838
  permission_add_project: Erstelle Projekt
839 839
  setting_new_project_user_role_id: Rolle einem Nicht-Administrator zugeordnet, welcher ein Projekt erstellt
840
  setting_short_desc_length: Länge der gekürzten Projektbeschreibung
840 841
  label_view_all_revisions: View all revisions
841 842
  label_tag: Tag
842 843
  label_branch: Branch
config/locales/en.yml
311 311
  setting_openid: Allow OpenID login and registration
312 312
  setting_password_min_length: Minimum password length
313 313
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
314
  setting_short_desc_length: Length of short project description
314 315
  
315 316
  permission_add_project: Create project
316 317
  permission_edit_project: Edit project
config/locales/es.yml
858 858
  mail_body_wiki_content_updated: La página wiki '{{page}}' ha sido actualizada por {{author}}.
859 859
  permission_add_project: Crear proyecto
860 860
  setting_new_project_user_role_id: Permiso asignado a un usuario no-administrador para crear proyectos
861
  setting_short_desc_length: Length of short project description
861 862
  label_view_all_revisions: View all revisions
862 863
  label_tag: Tag
863 864
  label_branch: Branch
config/locales/fi.yml
847 847
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
848 848
  permission_add_project: Create project
849 849
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
850
  setting_short_desc_length: Length of short project description
850 851
  label_view_all_revisions: View all revisions
851 852
  label_tag: Tag
852 853
  label_branch: Branch
config/locales/fr.yml
333 333
  setting_openid: "Autoriser l'authentification et l'enregistrement OpenID"
334 334
  setting_password_min_length: Longueur minimum des mots de passe
335 335
  setting_new_project_user_role_id: Rôle donné à un utilisateur non-administrateur qui crée un projet
336
  setting_short_desc_length: Length of short project description
336 337
  
337 338
  permission_add_project: Créer un projet
338 339
  permission_edit_project: Modifier le projet
config/locales/gl.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/he.yml
821 821
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
822 822
  permission_add_project: Create project
823 823
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
824
  setting_short_desc_length: Length of short project description
824 825
  label_view_all_revisions: View all revisions
825 826
  label_tag: Tag
826 827
  label_branch: Branch
config/locales/hu.yml
842 842
  mail_body_wiki_content_updated: A '{{page}}' wiki oldalt {{author}} frissítette.
843 843
  permission_add_project: Projekt létrehozása
844 844
  setting_new_project_user_role_id: Projekt létrehozási jog nem adminisztrátor felhasználóknak
845
  setting_short_desc_length: Length of short project description
845 846
  label_view_all_revisions: View all revisions
846 847
  label_tag: Tag
847 848
  label_branch: Branch
config/locales/it.yml
824 824
  mail_body_wiki_content_updated: La pagina '{{page}}' wiki è stata aggiornata da{{author}}.
825 825
  permission_add_project: Crea progetto
826 826
  setting_new_project_user_role_id: Ruolo assegnato agli utenti non amministratori che creano un progetto
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/ja.yml
339 339
  setting_openid: OpenIDによるログインと登録
340 340
  setting_password_min_length: パスワードの最低必要文字数
341 341
  setting_new_project_user_role_id: 管理者以外のユーザが作成したプロジェクトに設定するロール
342
  setting_short_desc_length: Length of short project description
342 343
  
343 344
  permission_add_project: プロジェクトの追加
344 345
  permission_edit_project: プロジェクトの編集
config/locales/ko.yml
366 366
  setting_repository_log_display_limit: 저장소 보기에 표시할 개정판 이력의 최대 갯수
367 367
  setting_file_max_size_displayed: 바로 보여줄 텍스트파일의 최대 크기
368 368
  setting_openid: OpenID 로그인과 등록 허용
369
  setting_password_min_length: 최소 암호 길이
369
<<<<<<< HEAD:config/locales/ko.yml
370 370
  setting_new_project_user_role_id: 프로젝트를 만든 사용자에게 주어질 역할
371

  
371
  setting_short_desc_length: Length of short project description
372
>>>>>>> d5f181f... Introducing a configurable length of the short project description.:config/locales/ko.yml
372 373
  permission_add_project: 프로젝트 생성
373 374
  permission_edit_project: 프로젝트 편집
374 375
  permission_select_project_modules: 프로젝트 모듈 선택
config/locales/lt.yml
847 847
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
848 848
  permission_add_project: Create project
849 849
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
850
  setting_short_desc_length: Length of short project description
850 851
  label_view_all_revisions: View all revisions
851 852
  label_tag: Tag
852 853
  label_branch: Branch
config/locales/nl.yml
799 799
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
800 800
  permission_add_project: Create project
801 801
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
802
  setting_short_desc_length: Length of short project description
802 803
  label_view_all_revisions: View all revisions
803 804
  label_tag: Tag
804 805
  label_branch: Branch
config/locales/no.yml
812 812
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
813 813
  permission_add_project: Create project
814 814
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
815
  setting_short_desc_length: Length of short project description
815 816
  label_view_all_revisions: View all revisions
816 817
  label_tag: Tag
817 818
  label_branch: Branch
config/locales/pl.yml
840 840
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
841 841
  permission_add_project: Create project
842 842
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
843
  setting_short_desc_length: Length of short project description
843 844
  label_view_all_revisions: View all revisions
844 845
  label_tag: Tag
845 846
  label_branch: Branch
config/locales/pt-BR.yml
845 845
  mail_body_wiki_content_updated: A página wiki '{{page}}' foi atualizada por {{author}}.
846 846
  permission_add_project: Criar projeto
847 847
  setting_new_project_user_role_id: Papel dado a um usuário não administrador que crie um projeto
848
  setting_short_desc_length: Length of short project description
848 849
  label_view_all_revisions: Ver todas as revisões
849 850
  label_tag: Etiqueta
850 851
  label_branch: Ramo
config/locales/pt.yml
832 832
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
833 833
  permission_add_project: Create project
834 834
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
835
  setting_short_desc_length: Length of short project description
835 836
  label_view_all_revisions: View all revisions
836 837
  label_tag: Tag
837 838
  label_branch: Branch
config/locales/ro.yml
814 814
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
815 815
  permission_add_project: Create project
816 816
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
817
  setting_short_desc_length: Length of short project description
817 818
  label_view_all_revisions: View all revisions
818 819
  label_tag: Tag
819 820
  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
816 816
  mail_body_wiki_content_updated: Wiki stránka '{{page}}' bola aktualizovaná užívateľom {{author}}.
817 817
  setting_repositories_encodings: Kódovanie repozitára
818 818
  setting_new_project_user_role_id: Rola dána non-admin užívateľovi, ktorý vytvorí projekt
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/sl.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/sr.yml
832 832
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
833 833
  permission_add_project: Create project
834 834
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
835
  setting_short_desc_length: Length of short project description
835 836
  label_view_all_revisions: View all revisions
836 837
  label_tag: Tag
837 838
  label_branch: Branch
config/locales/sv.yml
361 361
  setting_openid: Tillåt inloggning och registrering med OpenID
362 362
  setting_password_min_length: Minsta tillåtna lösenordslängd
363 363
  setting_new_project_user_role_id: Tilldelad roll för en icke-administratör som skapar ett projekt
364
  setting_short_desc_length: Length of short project description
364 365
  
365 366
  permission_add_project: Skapa projekt
366 367
  permission_edit_project: Ändra projekt
config/locales/th.yml
814 814
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
815 815
  permission_add_project: Create project
816 816
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
817
  setting_short_desc_length: Length of short project description
817 818
  label_view_all_revisions: View all revisions
818 819
  label_tag: Tag
819 820
  label_branch: Branch
config/locales/tr.yml
847 847
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
848 848
  permission_add_project: Create project
849 849
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
850
  setting_short_desc_length: Length of short project description
850 851
  label_view_all_revisions: View all revisions
851 852
  label_tag: Tag
852 853
  label_branch: Branch
config/locales/uk.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/vi.yml
876 876
  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
877 877
  permission_add_project: Create project
878 878
  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
879
  setting_short_desc_length: Length of short project description
879 880
  label_view_all_revisions: View all revisions
880 881
  label_tag: Tag
881 882
  label_branch: Branch
config/locales/zh-TW.yml
402 402
  setting_openid: 允許使用 OpenID 登入與註冊
403 403
  setting_password_min_length: 密碼最小長度
404 404
  setting_new_project_user_role_id: 管理者以外之用戶建立新專案時,將被指派的角色
405
  setting_short_desc_length: Length of short project description
405 406
  
406 407
  permission_add_project: 建立專案
407 408
  permission_edit_project: 編輯專案
config/locales/zh.yml
333 333
  setting_openid: 允许使用OpenID登录和注册
334 334
  setting_password_min_length: 最短密码长度
335 335
  setting_new_project_user_role_id: 非管理员用户新建项目时将被赋予的(在该项目中的)角色
336
  setting_short_desc_length: Length of short project description
336 337

  
337 338
  permission_add_project: 新建项目
338 339
  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
-