tagged version 2.2.1

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/tags/2.2.1@11153 e93f8b46-1217-0410-a6f0-8f06a7374b81

Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.2.9'
+gem 'rails', '3.2.11'
 gem "jquery-rails", "~> 2.0.2"
 gem "i18n", "~> 0.6.0"
 gem "coderay", "~> 1.0.6"

app/controllers/previews_controller.rb

@@ -26,7 +26,8 @@ class PreviewsController < ApplicationController
       if @description && @description.gsub(/(\r?\n|\n\r?)/, "\n") == @issue.description.to_s.gsub(/(\r?\n|\n\r?)/, "\n")
         @description = nil
       end
-      @notes = (params[:issue] ? params[:issue][:notes] : nil)
+      # params[:notes] is useful for preview of notes in issue history
+      @notes = params[:notes] || (params[:issue] ? params[:issue][:notes] : nil)
     else
       @description = (params[:issue] ? params[:issue][:description] : nil)
     end

app/helpers/issues_helper.rb

@@ -371,12 +371,16 @@ module IssuesHelper
   def issues_to_csv(issues, project, query, options={})
     decimal_separator = l(:general_csv_decimal_separator)
     encoding = l(:general_csv_encoding)
-    columns = (options[:columns] == 'all' ? query.available_columns : query.columns)
+    columns = (options[:columns] == 'all' ? query.available_inline_columns : query.inline_columns)
+    if options[:description]
+      if description = query.available_columns.detect {|q| q.name == :description}
+        columns << description
+      end
+    end
 
     export = FCSV.generate(:col_sep => l(:general_csv_separator)) do |csv|
       # csv header fields
-      csv << [ "#" ] + columns.collect {|c| Redmine::CodesetUtil.from_utf8(c.caption.to_s, encoding) } +
-        (options[:description] ? [Redmine::CodesetUtil.from_utf8(l(:field_description), encoding)] : [])
+      csv << [ "#" ] + columns.collect {|c| Redmine::CodesetUtil.from_utf8(c.caption.to_s, encoding) }
 
       # csv lines
       issues.each do |issue|
@@ -398,8 +402,7 @@ module IssuesHelper
           end
           s.to_s
         end
-        csv << [ issue.id.to_s ] + col_values.collect {|c| Redmine::CodesetUtil.from_utf8(c.to_s, encoding) } +
-          (options[:description] ? [Redmine::CodesetUtil.from_utf8(issue.description, encoding)] : [])
+        csv << [ issue.id.to_s ] + col_values.collect {|c| Redmine::CodesetUtil.from_utf8(c.to_s, encoding) }
       end
     end
     export

app/helpers/queries_helper.rb

@@ -50,6 +50,14 @@ module QueriesHelper
     end
   end
 
+  def available_block_columns_tags(query)
+    tags = ''.html_safe
+    query.available_block_columns.each do |column|
+      tags << content_tag('label', check_box_tag('c[]', column.name.to_s, query.has_column?(column)) + " #{column.caption}", :class => 'inline')
+    end
+    tags
+  end
+
   def column_header(column)
     column.sortable ? sort_header_tag(column.name.to_s, :caption => column.caption,
                                                         :default_order => column.default_order) :
@@ -70,6 +78,8 @@ module QueriesHelper
     when 'String'
       if column.name == :subject
         link_to(h(value), :controller => 'issues', :action => 'show', :id => issue)
+      elsif column.name == :description
+        issue.description? ? content_tag('div', textilizable(issue, :description), :class => "wiki") : ''
       else
         h(value)
       end

app/models/custom_field.rb

@@ -158,7 +158,13 @@ class CustomField < ActiveRecord::Base
     possible_values_options = possible_values_options(customized)
     if possible_values_options.present?
       keyword = keyword.to_s.downcase
-      possible_values_options.detect {|text, id| text.downcase == keyword}.try(:last)
+      if v = possible_values_options.detect {|text, id| text.downcase == keyword}
+        if v.is_a?(Array)
+          v.last
+        else
+          v
+        end
+      end
     else
       keyword
     end

app/models/query.rb

@@ -27,6 +27,7 @@ class QueryColumn
       self.groupable = name.to_s
     end
     self.default_order = options[:default_order]
+    @inline = options.key?(:inline) ? options[:inline] : true
     @caption_key = options[:caption] || "field_#{name}"
   end
 
@@ -43,6 +44,10 @@ class QueryColumn
     @sortable.is_a?(Proc) ? @sortable.call : @sortable
   end
 
+  def inline?
+    @inline
+  end
+
   def value(issue)
     issue.send name
   end
@@ -58,6 +63,7 @@ class QueryCustomFieldColumn < QueryColumn
     self.name = "cf_#{custom_field.id}".to_sym
     self.sortable = custom_field.order_statement || false
     self.groupable = custom_field.group_statement || false
+    @inline = true
     @cf = custom_field
   end
 
@@ -153,7 +159,8 @@ class Query < ActiveRecord::Base
     QueryColumn.new(:estimated_hours, :sortable => "#{Issue.table_name}.estimated_hours"),
     QueryColumn.new(:done_ratio, :sortable => "#{Issue.table_name}.done_ratio", :groupable => true),
     QueryColumn.new(:created_on, :sortable => "#{Issue.table_name}.created_on", :default_order => 'desc'),
-    QueryColumn.new(:relations, :caption => :label_related_issues)
+    QueryColumn.new(:relations, :caption => :label_related_issues),
+    QueryColumn.new(:description, :inline => false)
   ]
   cattr_reader :available_columns
 
@@ -511,6 +518,22 @@ class Query < ActiveRecord::Base
     end.compact
   end
 
+  def inline_columns
+    columns.select(&:inline?)
+  end
+
+  def block_columns
+    columns.reject(&:inline?)
+  end
+
+  def available_inline_columns
+    available_columns.select(&:inline?)
+  end
+
+  def available_block_columns
+    available_columns.reject(&:inline?)
+  end
+
   def default_columns_names
     @default_columns_names ||= begin
       default_columns = Setting.issue_list_default_columns.map(&:to_sym)

app/views/issues/_list.html.erb

@@ -10,7 +10,7 @@
                               :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
       </th>
       <%= sort_header_tag('id', :caption => '#', :default_order => 'desc') %>
-      <% query.columns.each do |column| %>
+      <% query.inline_columns.each do |column| %>
         <%= column_header(column) %>
       <% end %>
     </tr>
@@ -21,7 +21,7 @@
   <% if @query.grouped? && (group = @query.group_by_column.value(issue)) != previous_group %>
     <% reset_cycle %>
     <tr class="group open">
-      <td colspan="<%= query.columns.size + 2 %>">
+      <td colspan="<%= query.inline_columns.size + 2 %>">
         <span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
         <%= group.blank? ? l(:label_none) : column_content(@query.group_by_column, issue) %> <span class="count"><%= @issue_count_by_group[group] %></span>
         <%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}",
@@ -33,8 +33,15 @@
   <tr id="issue-<%= issue.id %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
     <td class="checkbox hide-when-print"><%= check_box_tag("ids[]", issue.id, false, :id => nil) %></td>
     <td class="id"><%= link_to issue.id, issue_path(issue) %></td>
-    <%= raw query.columns.map {|column| "<td class=\"#{column.css_classes}\">#{column_content(column, issue)}</td>"}.join %>
+    <%= raw query.inline_columns.map {|column| "<td class=\"#{column.css_classes}\">#{column_content(column, issue)}</td>"}.join %>
   </tr>
+  <% @query.block_columns.each do |column|
+       if (text = column_content(column, issue)) && text.present? -%>
+  <tr class="<%= current_cycle %>">
+    <td colspan="<%= @query.inline_columns.size + 2 %>" class="<%= column.css_classes %>"><%= text %></td>
+  </tr>
+  <% end -%>
+  <% end -%>
   <% end -%>
   </tbody>
 </table>

app/views/issues/index.html.erb

@@ -34,6 +34,10 @@
                                  @query.group_by)
                        ) %></td>
           </tr>
+          <tr>
+            <td><%= l(:button_show) %></td>
+            <td><%= available_block_columns_tags(@query) %></td>
+          </tr>
         </table>
       </div>
     </fieldset>
@@ -73,7 +77,7 @@
     <label><%= radio_button_tag 'columns', 'all' %> <%= l(:description_all_columns) %></label>
   </p>
   <p>
-    <label><%= check_box_tag 'description', '1' %> <%= l(:field_description) %></label>
+    <label><%= check_box_tag 'description', '1', @query.has_column?(:description) %> <%= l(:field_description) %></label>
   </p>
   <p class="buttons">
     <%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);" %>

app/views/journals/edit.js.erb

@@ -1,2 +1,8 @@
 $("#journal-<%= @journal.id %>-notes").hide();
-$("#journal-<%= @journal.id %>-notes").after('<%= escape_javascript(render :partial => 'notes_form') %>');
+
+if ($("form#journal-<%= @journal.id %>-form").length > 0) {
+  // journal edit form already loaded
+  $("#journal-<%= @journal.id %>-form").show();
+} else {
+  $("#journal-<%= @journal.id %>-notes").after('<%= escape_javascript(render :partial => 'notes_form') %>');
+}

app/views/queries/_columns.html.erb

@@ -4,7 +4,7 @@
       <%= label_tag "available_columns", l(:description_available_columns) %>
       <br />
       <%= select_tag 'available_columns',
-              options_for_select((query.available_columns - query.columns).collect {|column| [column.caption, column.name]}),
+              options_for_select((query.available_inline_columns - query.columns).collect {|column| [column.caption, column.name]}),
               :multiple => true, :size => 10, :style => "width:150px",
               :ondblclick => "moveOptions(this.form.available_columns, this.form.selected_columns);" %>
     </td>
@@ -18,7 +18,7 @@
       <%= label_tag "selected_columns", l(:description_selected_columns) %>
       <br />
       <%= select_tag((defined?(tag_name) ? tag_name : 'c[]'),
-              options_for_select(query.columns.collect {|column| [column.caption, column.name]}),
+              options_for_select(query.inline_columns.collect {|column| [column.caption, column.name]}),
               :id => 'selected_columns', :multiple => true, :size => 10, :style => "width:150px",
               :ondblclick => "moveOptions(this.form.selected_columns, this.form.available_columns);") %>
     </td>

app/views/queries/_form.html.erb

@@ -21,6 +21,9 @@
 
 <p><label for="query_group_by"><%= l(:field_group_by) %></label>
 <%= select 'query', 'group_by', @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, :include_blank => true %></p>
+
+<p><label><%= l(:button_show) %></label>
+<%= available_block_columns_tags(@query) %></p>
 </div>
 
 <fieldset id="filters"><legend><%= l(:label_filter_plural) %></legend>

config/locales/bg.yml

@@ -892,7 +892,7 @@ bg:
   label_cross_project_system: С всички проекти
 
   button_login: Вход
-  button_submit: Прикачване
+  button_submit: Изпращане
   button_save: Запис
   button_check_all: Избор на всички
   button_uncheck_all: Изчистване на всички

config/locales/ja.yml

@@ -1099,7 +1099,7 @@ ja:
   field_private_notes: プライベート注記
   permission_view_private_notes: プライベート注記の閲覧
   permission_set_notes_private: 注記をプライベートに設定
-  label_no_issues_in_project: no issues in project
+  label_no_issues_in_project: 次のプロジェクト内のチケットを除く
   label_any: すべて
   label_last_n_weeks: 直近%{count}週間
   setting_cross_project_subtasks: 異なるプロジェクトのチケット間の親子関係を許可

config/locales/ko.yml

@@ -326,7 +326,7 @@ ko:
   field_comments_sorting: 댓글 정렬
   field_parent_title: 상위 제목
   field_editable: 편집가능
-  field_watcher: 일감관계자
+  field_watcher: 일감지킴이
   field_identity_url: OpenID URL
   field_content: 내용
   field_group_by: 결과를 묶어 보여줄 기준
@@ -347,7 +347,7 @@ ko:
   setting_wiki_compression: 위키 이력 압축
   setting_feeds_limit: 피드에 포함할 항목의 수
   setting_default_projects_public: 새 프로젝트를 공개로 설정
-  setting_autofetch_changesets: 제출(commit)된 변경묶음을 자동으로 가져오기
+  setting_autofetch_changesets: 커밋(commit)된 변경묶음을 자동으로 가져오기
   setting_sys_api_enabled: 저장소 관리에 WS를 사용
   setting_commit_ref_keywords: 일감 참조에 사용할 키워드들
   setting_commit_fix_keywords: 일감 해결에 사용할 키워드들
@@ -392,8 +392,8 @@ ko:
   permission_save_queries: 검색양식 저장
   permission_view_gantt: Gantt차트 보기
   permission_view_calendar: 달력 보기
-  permission_view_issue_watchers: 일감관계자 보기
-  permission_add_issue_watchers: 일감관계자 추가
+  permission_view_issue_watchers: 일감지킴이 보기
+  permission_add_issue_watchers: 일감지킴이 추가
   permission_log_time: 작업시간 기록
   permission_view_time_entries: 시간입력 보기
   permission_edit_time_entries: 시간입력 편집
@@ -664,8 +664,8 @@ ko:
   label_time_tracking: 시간추적
   label_change_plural: 변경사항들
   label_statistics: 통계
-  label_commits_per_month: 월별 제출 내역
-  label_commits_per_author: 저자별 제출 내역
+  label_commits_per_month: 월별 커밋 내역
+  label_commits_per_author: 저자별 커밋 내역
   label_view_diff: 차이점 보기
   label_diff_inline: 한줄로
   label_diff_side_by_side: 두줄로
@@ -679,8 +679,8 @@ ko:
   label_relation_new: 새 관계
   label_relation_delete: 관계 지우기
   label_relates_to: "다음 일감과 관련됨:"
-  label_duplicates: "다음 일감과 겹침:"
-  label_duplicated_by: "다음 일감과 겹침:"
+  label_duplicates: "다음 일감에 중복됨:"
+  label_duplicated_by: "중복된 일감:"
   label_blocks: "다음 일감의 해결을 막고 있음:"
   label_blocked_by: "다음 일감에게 막혀 있음:"
   label_precedes: "다음에 진행할 일감:"
@@ -748,7 +748,7 @@ ko:
   label_planning: 프로젝트계획
   label_incoming_emails: 수신 메일
   label_generate_key: 키 생성
-  label_issue_watchers: 일감관계자
+  label_issue_watchers: 일감지킴이
   label_example: 예
   label_display: 표시방식
   label_sort: 정렬
@@ -807,7 +807,7 @@ ko:
   text_min_max_length_info: 0 는 제한이 없음을 의미함
   text_project_destroy_confirmation: 이 프로젝트를 삭제하고 모든 데이터를 지우시겠습니까?
   text_subprojects_destroy_warning: "하위 프로젝트(%{value})이(가) 자동으로 지워질 것입니다."
-  text_workflow_edit: 업무흐름 수정하려면 역할과 일감 유형을 선택하세요.
+  text_workflow_edit: 업무흐름을 수정하려면 역할과 일감 유형을 선택하세요.
   text_are_you_sure: 계속 진행 하시겠습니까?
   text_tip_issue_begin_day: 오늘 시작하는 업무(task)
   text_tip_issue_end_day: 오늘 종료하는 업무(task)
@@ -818,7 +818,7 @@ ko:
   text_tracker_no_workflow: 이 일감 유형에는 업무흐름이 정의되지 않았습니다.
   text_unallowed_characters: 허용되지 않는 문자열
   text_comma_separated: "구분자','를 이용해서 여러 개의 값을 입력할 수 있습니다."
-  text_issues_ref_in_commit_messages: 제출 메시지에서 일감을 참조하거나 해결하기
+  text_issues_ref_in_commit_messages: 커밋 메시지에서 일감을 참조하거나 해결하기
   text_issue_added: "%{author}이(가) 일감 %{id}을(를) 보고하였습니다."
   text_issue_updated: "%{author}이(가) 일감 %{id}을(를) 수정하였습니다."
   text_wiki_destroy_confirmation: 이 위키와 모든 내용을 지우시겠습니까?
@@ -879,8 +879,8 @@ ko:
 
   field_issue_to: 관련 일감 
   label_view_all_revisions: 모든 개정판 표시
-  label_tag: 표지(票識)저장소
-  label_branch: 분기(分岐)저장소
+  label_tag: 태그(Tag)
+  label_branch: 브랜치(Branch)
   error_no_tracker_in_project: 사용할 수 있도록 설정된 일감 유형이 없습니다. 프로젝트 설정을 확인하십시오.
   error_no_default_issue_status: '기본 상태가 정해져 있지 않습니다. 설정을 확인하십시오. (주 메뉴의 "관리" -> "일감 상태")'
   text_journal_changed: "%{label}을(를) %{old}에서 %{new}(으)로 변경되었습니다."
@@ -893,7 +893,7 @@ ko:
   text_journal_added: "%{label}에 %{value}이(가) 추가되었습니다."
   field_active: 사용중
   enumeration_system_activity: 시스템 작업
-  permission_delete_issue_watchers: 일감관계자 지우기
+  permission_delete_issue_watchers: 일감지킴이 지우기
   version_status_closed: 닫힘
   version_status_locked: 잠김
   version_status_open: 진행
@@ -1011,7 +1011,7 @@ ko:
   permission_set_issues_private: "일감을 공개나 비공개로 설정"
   label_issues_visibility_public: "모든 비공개 일감"
   text_issues_destroy_descendants_confirmation: "%{count} 개의 하위 일감을 삭제할 것입니다."
-  field_commit_logs_encoding: "제출(commit) 기록 인코딩"
+  field_commit_logs_encoding: "커밋(commit) 기록 인코딩"
   field_scm_path_encoding: "경로 인코딩"
   text_scm_path_encoding_note: "기본: UTF-8"
   field_path_to_repository: "저장소 경로"
@@ -1021,14 +1021,14 @@ ko:
   text_mercurial_repository_note: "로컬 저장소 (예: /hgrepo, c:\\hgrepo)"
   text_scm_command: "명령"
   text_scm_command_version: "버전"
-  label_git_report_last_commit: "파일이나 폴더의 마지막 제출(commit)을 보고"
+  label_git_report_last_commit: "파일이나 폴더의 마지막 커밋(commit)을 보고"
   text_scm_config: "SCM 명령을 config/configuration.yml에서 수정할 수 있습니다. 수정후에는 재시작하십시오."
   text_scm_command_not_available: "SCM 명령을 사용할 수 없습니다. 관리 페이지의 설정을 검사하십시오."
   notice_issue_successful_create: "%{id} 일감이 생성되었습니다."
   label_between: "사이"
   setting_issue_group_assignment: "그룹에 일감 할당 허용"
   label_diff: "비교(diff)"
-  text_git_repository_note: "저장소는 노출된 로컬입니다. (예: /gitrepo, c:\\gitrepo)"
+  text_git_repository_note: "로컬의 bare 저장소 (예: /gitrepo, c:\\gitrepo)"
   description_query_sort_criteria_direction: "정렬 방향"
   description_project_scope: "검색 범위"
   description_filter: "검색 조건"
@@ -1057,7 +1057,7 @@ ko:
   label_export_options: "내보내기 옵션: %{export_format}"
   error_attachment_too_big: "이 파일은 제한된 크기(%{max_size})를 초과하였기 때문에 업로드 할 수 없습니다."
 
-  notice_failed_to_save_time_entries: "Failed to save %{count} time entrie(s) on %{total} selected: %{ids}."
+  notice_failed_to_save_time_entries: "%{total} 개의 시간입력중 다음 %{count} 개의 저장에 실패했습니다:: %{ids}."
   label_x_issues:
     zero:  0 일감
     one:   1 일감 
@@ -1074,12 +1074,12 @@ ko:
   text_issue_conflict_resolution_overwrite: 변경내용 강제적용 (이전 덧글을 제외하고 덮어 씁니다)
   notice_issue_update_conflict: 일감이 수정되는 동안 다른 사용자에 의해서 변경되었습니다.
   text_issue_conflict_resolution_cancel: "변경내용을 되돌리고 다시 표시 %{link}"
-  permission_manage_related_issues: 연계된 일감 관리
-  field_auth_source_ldap_filter: LDAP filter
-  label_search_for_watchers: 추가할 일감관계자 검색
+  permission_manage_related_issues: 연결된 일감 관리
+  field_auth_source_ldap_filter: LDAP 필터
+  label_search_for_watchers: 추가할 일감지킴이 검색
   notice_account_deleted: 당신의 계정이 완전히 삭제되었습니다.
   setting_unsubscribe: 사용자들이 자신의 계정을 삭제토록 허용
-  button_delete_my_account: 나의계정삭제
+  button_delete_my_account: 나의 계정 삭제
   text_account_destroy_confirmation: |-
         계속하시겠습니까?
         계정이 삭제되면 복구할 수 없습니다.
@@ -1088,46 +1088,46 @@ ko:
   setting_session_lifetime: 세션 최대 시간
   setting_session_timeout: 세션 비활성화 타임아웃
   label_session_expiration: 세션 만료
-  permission_close_project: Close / reopen the project
-  label_show_closed_projects: View closed projects
-  button_close: Close
-  button_reopen: Reopen
-  project_status_active: active
-  project_status_closed: closed
-  project_status_archived: archived
-  text_project_closed: This project is closed and read-only.
-  notice_user_successful_create: User %{id} created.
-  field_core_fields: Standard fields
-  field_timeout: Timeout (in seconds)
-  setting_thumbnails_enabled: Display attachment thumbnails
-  setting_thumbnails_size: Thumbnails size (in pixels)
-  label_status_transitions: Status transitions
-  label_fields_permissions: Fields permissions
-  label_readonly: Read-only
-  label_required: Required
+  permission_close_project: 프로젝트를 닫거나 다시 열기
+  label_show_closed_projects: 닫힌 프로젝트 보기
+  button_close: 닫기
+  button_reopen: 다시 열기
+  project_status_active: 사용중
+  project_status_closed: 닫힘
+  project_status_archived: 잠금보관
+  text_project_closed: 이 프로젝트는 닫혀 있으며 읽기 전용입니다.
+  notice_user_successful_create: 사용자 %{id} 이(가) 생성되었습니다.
+  field_core_fields: 표준 항목들
+  field_timeout: 타임아웃 (초)
+  setting_thumbnails_enabled: 첨부파일의 썸네일을 보여줌
+  setting_thumbnails_size: 썸네일 크기 (픽셀)
+  label_status_transitions: 일감 상태 변경
+  label_fields_permissions: 항목 편집 권한
+  label_readonly: 읽기 전용
+  label_required: 필수
   text_repository_identifier_info: "소문자(a-z),숫자,대쉬(-)와 밑줄(_)만 가능합니다.<br />식별자는 저장후에는 수정할 수 없습니다."
   field_board_parent: Parent forum
-  label_attribute_of_project: Project's %{name}
-  label_attribute_of_author: Author's %{name}
-  label_attribute_of_assigned_to: Assignee's %{name}
-  label_attribute_of_fixed_version: Target version's %{name}
-  label_copy_subtasks: Copy subtasks
-  label_copied_to: copied to
-  label_copied_from: copied from
-  label_any_issues_in_project: any issues in project
-  label_any_issues_not_in_project: any issues not in project
-  field_private_notes: Private notes
-  permission_view_private_notes: View private notes
-  permission_set_notes_private: Set notes as private
-  label_no_issues_in_project: no issues in project
+  label_attribute_of_project: "프로젝트의 %{name}"
+  label_attribute_of_author: "저자의 %{name}"
+  label_attribute_of_assigned_to: "담당자의 %{name}"
+  label_attribute_of_fixed_version: "목표버전의 %{name}"
+  label_copy_subtasks: 하위 일감들을 복사
+  label_copied_to: "다음 일감으로 복사됨:"
+  label_copied_from: "다음 일감으로부터 복사됨:"
+  label_any_issues_in_project: 다음 프로젝트에 속한 아무 일감
+  label_any_issues_not_in_project: 다음 프로젝트에 속하지 않은 아무 일감
+  field_private_notes: 비공개 덧글
+  permission_view_private_notes: 비공개 덧글 보기
+  permission_set_notes_private: 덧글을 비공개로 설정
+  label_no_issues_in_project: 다음 프로젝트 내에서 해당 일감 없음
   label_any: 모두
-  label_last_n_weeks: last %{count} weeks
-  setting_cross_project_subtasks: Allow cross-project subtasks
+  label_last_n_weeks: 최근 %{count} 주
+  setting_cross_project_subtasks: 다른 프로젝트의 일감을 상위 일감으로 지정하는 것을 허용
   label_cross_project_descendants: 하위 프로젝트
   label_cross_project_tree: 최상위 및 모든 하위 프로젝트
   label_cross_project_hierarchy: 상위 및 하위 프로젝트
   label_cross_project_system: 모든 프로젝트
-  button_hide: Hide
-  setting_non_working_week_days: Non-working days
-  label_in_the_next_days: in the next
-  label_in_the_past_days: in the past
+  button_hide: 숨기기
+  setting_non_working_week_days: 비근무일 (non-working days)
+  label_in_the_next_days: 다음
+  label_in_the_past_days: 지난

config/locales/lt.yml

@@ -682,12 +682,12 @@ lt:
   label_filter_plural: Filtrai
   label_equals: yra
   label_not_equals: nėra
-  label_in_less_than: mažiau negu
-  label_in_more_than: daugiau negu
+  label_in_less_than: anksčiau nei po
+  label_in_more_than: vėliau nei po
   label_greater_or_equal: '>='
   label_less_or_equal: '<='
   label_between: tarp
-  label_in: po
+  label_in: per
   label_today: šiandien
   label_all_time: visas laikas
   label_yesterday: vakar
@@ -698,11 +698,11 @@ lt:
   label_last_month: praeitas mėnuo
   label_this_year: šiemet
   label_date_range: Dienų diapazonas
-  label_less_than_ago: prieš mažiau negu dienas
-  label_more_than_ago: prieš daugiau negu dienas
-  label_ago: dienomis prieš
-  label_contains: turi savyje
-  label_not_contains: neturi savyje
+  label_less_than_ago: vėliau nei prieš
+  label_more_than_ago: anksčiau nei prieš
+  label_ago: prieš
+  label_contains: turi
+  label_not_contains: neturi
   label_day_plural: dienų(os)
   label_repository: Saugykla
   label_repository_plural: Saugyklos
@@ -1064,79 +1064,79 @@ lt:
   description_date_from: Įvesti pradžios datą
   description_date_to: Įvesti pabaigos datą
 
-  label_additional_workflow_transitions_for_assignee: Additional transitions allowed when the user is the assignee
-  label_additional_workflow_transitions_for_author: Additional transitions allowed when the user is the author
-  notice_failed_to_save_time_entries: "Failed to save %{count} time entrie(s) on %{total} selected: %{ids}."
+  label_additional_workflow_transitions_for_assignee: Papildomi darbų eigos variantai kai darbas paskirtas vartotojui
+  label_additional_workflow_transitions_for_author: Papildomi darbų eigos variantai kai vartotojas yra darbo autorius
+  notice_failed_to_save_time_entries: "Nepavyko išsaugoti %{count} laiko žurnalo įrašų iš %{total} parinktų: %{ids}."
   label_x_issues:
     zero:  0 darbas
     one:   1 darbas
-    other: "%{count} darbai"
-  label_repository_new: New repository
-  field_repository_is_default: Main repository
-  label_copy_attachments: Copy attachments
+    other: "%{count} darbai(ų)"
+  label_repository_new: Nauja saugykla
+  field_repository_is_default: Pagrindinė saugykla
+  label_copy_attachments: Kopijuoti priedus
   label_item_position: "%{position}/%{count}"
-  label_completed_versions: Completed versions
-  text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
-  field_multiple: Multiple values
+  label_completed_versions: Užbaigtos versijos
+  text_project_identifier_info: Leidžiamos tik mažosios raidės (a-z), skaitmenys, brūkšneliai ir pabraukimo simboliai.<br />Kartą išsaugojus pakeitimai negalimi
+  field_multiple: Keletas reikšmių
   setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed
-  text_issue_conflict_resolution_add_notes: Add my notes and discard my other changes
-  text_issue_conflict_resolution_overwrite: Apply my changes anyway (previous notes will be kept but some changes may be overwritten)
-  notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
-  text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
-  permission_manage_related_issues: Manage related issues
-  field_auth_source_ldap_filter: LDAP filter
-  label_search_for_watchers: Search for watchers to add
-  notice_account_deleted: Your account has been permanently deleted.
-  setting_unsubscribe: Allow users to delete their own account
-  button_delete_my_account: Delete my account
+  text_issue_conflict_resolution_add_notes: Išsaugoti mano žinutę ir atmesti likusius mano pataisymus
+  text_issue_conflict_resolution_overwrite: Išsaugoti mano pakeitimus (ankstesnių pakeitimų žinutės bus išsaugotos, tačiau kai kurie pakeitimai bus perrašyti)
+  notice_issue_update_conflict: Darbas buvo pakoreguotas kito vartotojo kol jūs atlikote pakeitimus.
+  text_issue_conflict_resolution_cancel: Atmesti visus mano pakeitimus ir iš naujo rodyti %{link}
+  permission_manage_related_issues: Tvarkyti susietus darbus
+  field_auth_source_ldap_filter: LDAP filtras
+  label_search_for_watchers: Ieškoti vartotojų kuriuos įtraukti kaip stebėtojus
+  notice_account_deleted: Jūsų paskyra panaikinta.
+  setting_unsubscribe: Leisti vartotojams panaikinti savo paskyrą
+  button_delete_my_account: Panaikinti savo paskyrą
   text_account_destroy_confirmation: |-
-    Are you sure you want to proceed?
-    Your account will be permanently deleted, with no way to reactivate it.
-  error_session_expired: Your session has expired. Please login again.
-  text_session_expiration_settings: "Warning: changing these settings may expire the current sessions including yours."
-  setting_session_lifetime: Session maximum lifetime
-  setting_session_timeout: Session inactivity timeout
-  label_session_expiration: Session expiration
-  permission_close_project: Close / reopen the project
-  label_show_closed_projects: View closed projects
-  button_close: Close
-  button_reopen: Reopen
-  project_status_active: active
-  project_status_closed: closed
-  project_status_archived: archived
-  text_project_closed: This project is closed and read-only.
-  notice_user_successful_create: User %{id} created.
-  field_core_fields: Standard fields
-  field_timeout: Timeout (in seconds)
-  setting_thumbnails_enabled: Display attachment thumbnails
-  setting_thumbnails_size: Thumbnails size (in pixels)
-  label_status_transitions: Status transitions
-  label_fields_permissions: Fields permissions
-  label_readonly: Read-only
-  label_required: Required
-  text_repository_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
-  field_board_parent: Parent forum
-  label_attribute_of_project: Project's %{name}
-  label_attribute_of_author: Author's %{name}
-  label_attribute_of_assigned_to: Assignee's %{name}
-  label_attribute_of_fixed_version: Target version's %{name}
-  label_copy_subtasks: Copy subtasks
-  label_copied_to: copied to
-  label_copied_from: copied from
-  label_any_issues_in_project: any issues in project
-  label_any_issues_not_in_project: any issues not in project
-  field_private_notes: Private notes
-  permission_view_private_notes: View private notes
-  permission_set_notes_private: Set notes as private
-  label_no_issues_in_project: no issues in project
+    Ar tikrai norite tęsti?
+    Jūsų paskyra bus panaikinta ir nebus galimybės jos atkurti.
+  error_session_expired: Jūsų sesija pasibaigė. Prašome prisijunti iš naujo.
+  text_session_expiration_settings: "Įspėjimas: atlikus šiuos pakeitimus visos aktyvios sesijos gali nustoti galiojusios (įskaitant jūsų sesiją)."
+  setting_session_lifetime: Sesijos maksimalus galiojimas
+  setting_session_timeout: Sesijos neveiklumo laiko tarpas
+  label_session_expiration: Baigėsi sujungimo sesija
+  permission_close_project: Uždaryti / atnaujinti projektą
+  label_show_closed_projects: Matyti uždarytus projektus
+  button_close: Uždaryti
+  button_reopen: Atnaujinti
+  project_status_active: aktyvus
+  project_status_closed: uždarytas
+  project_status_archived: archyvuotas
+  text_project_closed: Šis projektas yra uždarytas, prieinamas tik peržiūrai.
+  notice_user_successful_create: Vartotojas %{id} sukurtas.
+  field_core_fields: Standartiniai laukai
+  field_timeout: Timeout (po sek.)
+  setting_thumbnails_enabled: Rodyti sumažintus priedų atvaizdus
+  setting_thumbnails_size: Sumažinto atvaizdo dydis (taškeliais)
+  label_status_transitions: Darbų eiga
+  label_fields_permissions: Leidimai
+  label_readonly: Tik peržiūra
+  label_required: Privaloma(s)
+  text_repository_identifier_info: Leidžiamos tik mažosios raidės (a-z), skaitmenys, brūkšneliai ir pabraukimo simboliai.<br />Kartą išsaugojus pakeitimai negalimi
+  field_board_parent: Pagrindinis forumas
+  label_attribute_of_project: Projekto pavadinimas %{name}
+  label_attribute_of_author: Autorius %{name}
+  label_attribute_of_assigned_to: Paskirtas %{name}
+  label_attribute_of_fixed_version: Versijos %{name}
+  label_copy_subtasks: Kopijuoti darbo dalis
+  label_copied_to: kopijuota į
+  label_copied_from: kopijuota iš
+  label_any_issues_in_project: bet kurie projekto darbai
+  label_any_issues_not_in_project: bet kurie ne šio projekto darbai
+  field_private_notes: Privačios žinutės
+  permission_view_private_notes: Matyti privačias žinutes
+  permission_set_notes_private: Pakeisti žinutę privačia
+  label_no_issues_in_project: projekte nėra darbų
   label_any: visi
-  label_last_n_weeks: last %{count} weeks
-  setting_cross_project_subtasks: Allow cross-project subtasks
+  label_last_n_weeks: prieš %{count} sav.
+  setting_cross_project_subtasks: Leisti susieti skirtingų projektų užduočių dalis
   label_cross_project_descendants: Su subprojektais
   label_cross_project_tree: Su projekto medžiu
   label_cross_project_hierarchy: Su projekto hierarchija
   label_cross_project_system: Su visais projektais
-  button_hide: Hide
-  setting_non_working_week_days: Non-working days
-  label_in_the_next_days: in the next
-  label_in_the_past_days: in the past
+  button_hide: Slėpti
+  setting_non_working_week_days: Nedarbo dienos
+  label_in_the_next_days: per ateinančias
+  label_in_the_past_days: per paskutines

config/locales/nl.yml

@@ -49,7 +49,7 @@ nl:
         one:   "ongeveer 1 uur"
         other: "ongeveer %{count} uren"
       x_hours:
-        one:   "1 hour"
+        one:   "1 uur"
         other: "%{count} hours"
       x_days:
         one:   "1 dag"
@@ -989,61 +989,61 @@ nl:
   description_all_columns: Alle kolommen
   button_export: Exporteren
   label_export_options: "%{export_format} export opties"
-  error_attachment_too_big: This file cannot be uploaded because it exceeds the maximum allowed file size (%{max_size})
-  notice_failed_to_save_time_entries: "Failed to save %{count} time entrie(s) on %{total} selected: %{ids}."
+  error_attachment_too_big: Dit bestand kan niet worden geupload omdat het de maximaal toegestane grootte overschrijd (%{max_size})
+  notice_failed_to_save_time_entries: "Opslaan gefaald voor %{count} tijdsnotatie(s) van %{total} geselecteerde: %{ids}."
   label_x_issues:
-    zero:  0 issue
-    one:   1 issue
-    other: "%{count} issues"
-  label_repository_new: New repository
-  field_repository_is_default: Main repository
-  label_copy_attachments: Copy attachments
+    zero:  0 incidenten
+    one:   1 incidenten
+    other: "%{count} incidenten"
+  label_repository_new: Nieuw repository
+  field_repository_is_default: Hoofd repository
+  label_copy_attachments: Copieer bijlage(n)
   label_item_position: "%{position}/%{count}"
-  label_completed_versions: Completed versions
-  field_multiple: Multiple values
-  setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed
-  text_issue_conflict_resolution_add_notes: Add my notes and discard my other changes
-  text_issue_conflict_resolution_overwrite: Apply my changes anyway (previous notes will be kept but some changes may be overwritten)
-  notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
-  text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
-  permission_manage_related_issues: Manage related issues
+  label_completed_versions: Versies compleet
+  field_multiple: Meerdere waardes
+  setting_commit_cross_project_ref: Sta toe om incidenten van alle projecten te refereren en oplossen
+  text_issue_conflict_resolution_add_notes: Voeg mijn notities toe en annuleer andere wijzigingen
+  text_issue_conflict_resolution_overwrite: Voeg mijn wijzigingen alsnog toe (voorgaande notities worden bewaard, maar sommige kunnen overschreden worden)
+  notice_issue_update_conflict: Dit incident is reeds geupdate door een andere gebruiker terwijl jij bezig was
+  text_issue_conflict_resolution_cancel: Annuleer mijn wijzigingen en geef pagina opnieuw weer %{link}
+  permission_manage_related_issues: Beheer gerelateerde incidenten
   field_auth_source_ldap_filter: LDAP filter
-  label_search_for_watchers: Search for watchers to add
-  notice_account_deleted: Your account has been permanently deleted.
-  setting_unsubscribe: Allow users to delete their own account
-  button_delete_my_account: Delete my account
+  label_search_for_watchers: Zoek om monitoorders toe te voegen
+  notice_account_deleted: Uw account is permanent verwijderd
+  setting_unsubscribe: Sta gebruikers toe hun eigen account te verwijderen
+  button_delete_my_account: Verwijder mijn account
   text_account_destroy_confirmation: |-
-    Are you sure you want to proceed?
-    Your account will be permanently deleted, with no way to reactivate it.
-  error_session_expired: Your session has expired. Please login again.
-  text_session_expiration_settings: "Warning: changing these settings may expire the current sessions including yours."
-  setting_session_lifetime: Session maximum lifetime
-  setting_session_timeout: Session inactivity timeout
-  label_session_expiration: Session expiration
-  permission_close_project: Close / reopen the project
-  label_show_closed_projects: View closed projects
-  button_close: Close
-  button_reopen: Reopen
-  project_status_active: active
-  project_status_closed: closed
-  project_status_archived: archived
-  text_project_closed: This project is closed and read-only.
-  notice_user_successful_create: User %{id} created.
-  field_core_fields: Standard fields
+    Weet u zeker dat u door wilt gaan?
+    Uw account wordt permanent verwijderd zonder mogelijkheid deze te heractiveren.
+  error_session_expired: Uw sessie is verlopen. U dient opnieuw in te loggen.
+  text_session_expiration_settings: "Waarschuwing: door deze instelling te wijzigen kan sessies laten verlopen inclusief de uwe"
+  setting_session_lifetime: Maximale sessieduur
+  setting_session_timeout: Sessie inactiviteit timeout
+  label_session_expiration: Sessie verlopen
+  permission_close_project: Sluit / heropen project
+  label_show_closed_projects: Gesloten projecten weergeven
+  button_close: Sluiten
+  button_reopen: Heropen
+  project_status_active: actief
+  project_status_closed: gesloten
+  project_status_archived: gearchiveerd
+  text_project_closed: Dit project is gesloten en op alleen-lezen
+  notice_user_successful_create: Gebruiker %{id} aangemaakt.
+  field_core_fields: Standaard verleden
   field_timeout: Timeout (in seconds)
-  setting_thumbnails_enabled: Display attachment thumbnails
-  setting_thumbnails_size: Thumbnails size (in pixels)
-  label_status_transitions: Status transitions
-  label_fields_permissions: Fields permissions
-  label_readonly: Read-only
-  label_required: Required
+  setting_thumbnails_enabled: Geef bijlage miniaturen weer
+  setting_thumbnails_size: Grootte miniaturen (in pixels)
+  label_status_transitions: Status transitie
+  label_fields_permissions: Permissie velden
+  label_readonly: Alleen-lezen
+  label_required: Verplicht
   text_repository_identifier_info: 'Alleen kleine letter (a-z), cijfers, streepjes en liggende streepjes zijn toegestaan.<br />Eenmaal opgeslagen kan de identifier niet worden gewijzigd.'
-  field_board_parent: Parent forum
-  label_attribute_of_project: Project's %{name}
-  label_attribute_of_author: Author's %{name}
-  label_attribute_of_assigned_to: Assignee's %{name}
-  label_attribute_of_fixed_version: Target version's %{name}
-  label_copy_subtasks: Copy subtasks
+  field_board_parent: Hoofd forum
+  label_attribute_of_project: Project %{name}
+  label_attribute_of_author: Auteur(s) %{name}
+  label_attribute_of_assigned_to: Toegewezen %{name}
+  label_attribute_of_fixed_version: Target versions %{name}
+  label_copy_subtasks: Kopieer subtaken
   label_copied_to: copied to
   label_copied_from: copied from
   label_any_issues_in_project: any issues in project

config/locales/no.yml

@@ -926,13 +926,13 @@
   notice_gantt_chart_truncated: Diagrammet ble avkortet fordi det overstiger det maksimale antall elementer som kan vises (%{max})
   setting_gantt_items_limit: Maksimalt antall elementer vist på gantt-diagrammet
   field_warn_on_leaving_unsaved: Vis meg en advarsel når jeg forlater en side med ikke lagret tekst
-  text_warn_on_leaving_unsaved: Den gjeldende siden inneholder tekst som ikke er lagret, som vil bli tapt hvis du forlater denne siden.
+  text_warn_on_leaving_unsaved: Siden inneholder tekst som ikke er lagret og som vil bli tapt om du forlater denne siden.
   label_my_queries: Mine egne spørringer
   text_journal_changed_no_detail: "%{label} oppdatert"
   label_news_comment_added: Kommentar lagt til en nyhet
   button_expand_all: Utvid alle
   button_collapse_all: Kollaps alle
-  label_additional_workflow_transitions_for_assignee: Ytterligere overganger tillatt når brukeren er sakens tildelte
+  label_additional_workflow_transitions_for_assignee: Ytterligere overganger tillatt når brukeren er den som er tildelt saken
   label_additional_workflow_transitions_for_author: Ytterligere overganger tillatt når brukeren er den som har opprettet saken
   label_bulk_edit_selected_time_entries: Masserediger valgte timeliste-oppføringer
   text_time_entries_destroy_confirmation: Er du sikker på du vil slette de(n) valgte timeliste-oppføringen(e)?
@@ -970,64 +970,64 @@
   setting_issue_group_assignment: Tillat tildeling av saker til grupper
   label_diff: diff
 
-  description_query_sort_criteria_direction: Sort direction
+  description_query_sort_criteria_direction: Sorteringsretning
   description_project_scope: Search scope
   description_filter: Filter
   description_user_mail_notification: Mail notification settings
-  description_date_from: Enter start date
-  description_message_content: Message content
-  description_available_columns: Available Columns
-  description_date_range_interval: Choose range by selecting start and end date
+  description_date_from: Oppgi startdato
+  description_message_content: Meldingsinnhold
+  description_available_columns: Tilgjengelige kolonner
+  description_date_range_interval: Velg datointervall ved å spesifisere start- og sluttdato
   description_issue_category_reassign: Choose issue category
-  description_search: Searchfield
+  description_search: Søkefelt
   description_notes: Notes
   description_date_range_list: Choose range from list
-  description_choose_project: Projects
-  description_date_to: Enter end date
+  description_choose_project: Prosjekter
+  description_date_to: Oppgi sluttdato
   description_query_sort_criteria_attribute: Sort attribute
-  description_wiki_subpages_reassign: Choose new parent page
-  description_selected_columns: Selected Columns
-  label_parent_revision: Parent
-  label_child_revision: Child
+  description_wiki_subpages_reassign: Velg ny overordnet side
+  description_selected_columns: Valgte kolonner
+  label_parent_revision: Overordnet
+  label_child_revision: Underordnet
   error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
-  setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
-  button_edit_section: Edit this section
+  setting_default_issue_start_date_to_creation_date: Bruk dagens dato som startdato for nye saker
+  button_edit_section: Rediger denne seksjonen
   setting_repositories_encodings: Attachments and repositories encodings
-  description_all_columns: All Columns
-  button_export: Export
-  label_export_options: "%{export_format} export options"
-  error_attachment_too_big: This file cannot be uploaded because it exceeds the maximum allowed file size (%{max_size})
+  description_all_columns: Alle kolonnene
+  button_export: Eksporter
+  label_export_options: "%{export_format} eksportvalg"
+  error_attachment_too_big: Filen overstiger maksimum filstørrelse (%{max_size}) og kan derfor ikke lastes opp
   notice_failed_to_save_time_entries: "Failed to save %{count} time entrie(s) on %{total} selected: %{ids}."
   label_x_issues:
-    zero:  0 sak
+    zero:  0 saker
     one:   1 sak
     other: "%{count} saker"
-  label_repository_new: New repository
-  field_repository_is_default: Main repository
-  label_copy_attachments: Copy attachments
+  label_repository_new: Nytt depot
+  field_repository_is_default: Hoveddepot
+  label_copy_attachments: Kopier vedlegg
   label_item_position: "%{position}/%{count}"
   label_completed_versions: Completed versions
-  text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
-  field_multiple: Multiple values
+  text_project_identifier_info: Kun små bokstaver (a-z), tall, bindestrek (-) og "underscore" (_) er tillatt.<br />Etter lagring er det ikke mulig å gjøre endringer.
+  field_multiple: Flere verdier
   setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed
   text_issue_conflict_resolution_add_notes: Add my notes and discard my other changes
   text_issue_conflict_resolution_overwrite: Apply my changes anyway (previous notes will be kept but some changes may be overwritten)
-  notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
-  text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
+  notice_issue_update_conflict: Saken ble oppdatert av en annen bruker mens du redigerte den.
+  text_issue_conflict_resolution_cancel: Forkast alle endringen mine og vis %{link} på nytt
   permission_manage_related_issues: Manage related issues
   field_auth_source_ldap_filter: LDAP filter
   label_search_for_watchers: Search for watchers to add
-  notice_account_deleted: Your account has been permanently deleted.
-  setting_unsubscribe: Allow users to delete their own account
-  button_delete_my_account: Delete my account
+  notice_account_deleted: Din konto er ugjenkallelig slettet.
+  setting_unsubscribe: Tillat brukere å slette sin egen konto
+  button_delete_my_account: Slett kontoen min
   text_account_destroy_confirmation: |-
-    Are you sure you want to proceed?
-    Your account will be permanently deleted, with no way to reactivate it.
-  error_session_expired: Your session has expired. Please login again.
-  text_session_expiration_settings: "Warning: changing these settings may expire the current sessions including yours."
-  setting_session_lifetime: Session maximum lifetime
-  setting_session_timeout: Session inactivity timeout
-  label_session_expiration: Session expiration
+    Er du sikker på at du ønsker å fortsette?
+    Kontoen din vil bli ugjenkallelig slettet uten mulighet for å reaktiveres igjen.
+  error_session_expired: Økten har gått ut på tid. Vennligst logg på igjen.
+  text_session_expiration_settings: "Advarsel: ved å endre disse innstillingene kan aktive økter gå ut på tid, inkludert din egen."
+  setting_session_lifetime: Øktenes makslengde
+  setting_session_timeout: Økten er avsluttet på grunn av inaktivitet
+  label_session_expiration: Økten er avsluttet
   permission_close_project: Close / reopen the project
   label_show_closed_projects: View closed projects
   button_close: Close

config/locales/ru.yml

@@ -117,8 +117,8 @@ ru:
         many:  "около %{count} часов"
         other: "около %{count} часа"
       x_hours:
-        one:   "1 hour"
-        other: "%{count} hours"
+        one:   "1 час"
+        other: "%{count} часов"
       x_days:
         one:   "%{count} день"
         few:   "%{count} дня"
@@ -502,7 +502,7 @@ ru:
   label_enumeration_new: Новое значение
   label_enumerations: Списки значений
   label_environment: Окружение
-  label_equals: является
+  label_equals: соответствует
   label_example: Пример
   label_export_to: Экспортировать в
   label_feed_plural: RSS
@@ -603,7 +603,7 @@ ru:
   label_no_data: Нет данных для отображения
   label_none: отсутствует
   label_not_contains: не содержит
-  label_not_equals: не является
+  label_not_equals: не соответствует
   label_open_issues: открыто
   label_open_issues_plural: открыто
   label_open_issues_plural2: открыто
@@ -1120,7 +1120,7 @@ ru:
   button_export: Экспорт
   label_export_options: "%{export_format} параметры экспорта"
   error_attachment_too_big: Этот файл нельзя загрузить из-за превышения максимального размера файла (%{max_size})
-  notice_failed_to_save_time_entries: "Failed to save %{count} time entrie(s) on %{total} selected: %{ids}."
+  notice_failed_to_save_time_entries: "Невозможно сохранить %{count} затраченное время для %{total} выбранных: %{ids}."
   label_x_issues:
     zero:  0 Задач
     one:   1 Задача
@@ -1146,11 +1146,11 @@ ru:
   setting_unsubscribe: "Разрешить пользователям удалять свои учетные записи" 
   button_delete_my_account: "Удалить мою учетную запись" 
   text_account_destroy_confirmation: "Ваша учетная запись будет полностью удалена без возможности восстановления.\nВы уверены, что хотите продолжить?" 
-  error_session_expired: Your session has expired. Please login again.
+  error_session_expired: Срок вашей сессии истек. Пожалуйста войдите еще раз
   text_session_expiration_settings: "Warning: changing these settings may expire the current sessions including yours."
-  setting_session_lifetime: Session maximum lifetime
-  setting_session_timeout: Session inactivity timeout
-  label_session_expiration: Session expiration
+  setting_session_lifetime: Максимальная продолжительность сессии
+  setting_session_timeout: Таймут сессии 
+  label_session_expiration: Срок истечения сессии
   permission_close_project: Закрывать / открывать проекты
   label_show_closed_projects: Просматривать закрытые проекты
   button_close: Сделать закрытым
@@ -1161,19 +1161,19 @@ ru:
   text_project_closed: Проект закрыт и находиться в режиме только для чтения.
   notice_user_successful_create: Пользователь %{id} создан.
   field_core_fields: Стандартные поля
-  field_timeout: Timeout (in seconds)
-  setting_thumbnails_enabled: Display attachment thumbnails
-  setting_thumbnails_size: Thumbnails size (in pixels)
+  field_timeout: Таймаут (в секундах)
+  setting_thumbnails_enabled: Отображать превью для приложений
+  setting_thumbnails_size: Размер первью (в пикселях)
   label_status_transitions: Статус-переходы
   label_fields_permissions: Права на изменения полей
   label_readonly: Не изменяется
   label_required: Обязательное
   text_repository_identifier_info: Допускаются только строчные латинские буквы (a-z), цифры, тире и подчеркивания.<br />После сохранения идентификатор изменить нельзя.
   field_board_parent: Родительский форум
-  label_attribute_of_project: Project's %{name}
+  label_attribute_of_project: Проект %{name}
   label_attribute_of_author: Имя автора %{name}
-  label_attribute_of_assigned_to: Assignee's %{name}
-  label_attribute_of_fixed_version: Target version's %{name}
+  label_attribute_of_assigned_to: Назначена %{name}
+  label_attribute_of_fixed_version: Версия %{name}
   label_copy_subtasks: Копировать подзадачи
   label_copied_to: скопирована в
   label_copied_from: скопирована с
@@ -1182,15 +1182,15 @@ ru:
   field_private_notes: Приватный комментарий
   permission_view_private_notes: Просмотр приватных комментариев
   permission_set_notes_private: Размещение приватных комментариев
-  label_no_issues_in_project: no issues in project
+  label_no_issues_in_project: нет задач в проекте
   label_any: все
-  label_last_n_weeks: last %{count} weeks
-  setting_cross_project_subtasks: Allow cross-project subtasks
+  label_last_n_weeks: последние %{count} недель
+  setting_cross_project_subtasks: Разрешить подзадачи в между проектами
   label_cross_project_descendants: С подпроектами
   label_cross_project_tree: С деревом проектов
   label_cross_project_hierarchy: С иерархией проектов
   label_cross_project_system: Со всеми проектами
-  button_hide: Hide
-  setting_non_working_week_days: Non-working days
-  label_in_the_next_days: in the next
-  label_in_the_past_days: in the past
+  button_hide: Скрыть
+  setting_non_working_week_days: Не рабочие дни
+  label_in_the_next_days: в средующие дни
+  label_in_the_past_days: в прошлые дни

doc/CHANGELOG

@@ -4,6 +4,86 @@ Redmine - project management software
 Copyright (C) 2006-2012  Jean-Philippe Lang
 http://www.redmine.org/
 
+== 2013-01-09 v2.2.1
+
+* Upgrade to Rails 3.2.11
+* Defect #12652: "Copy ticket" selects "new ticket"
+* Defect #12691: Textile Homepage Dead?
+* Defect #12711: incorrect fix of lib/SVG/Graph/TimeSeries.rb
+* Defect #12744: Unable to call a macro with a name that contains uppercase letters
+* Defect #12776: Security vulnerability in Rails 3.2.10 (CVE-2013-0156)
+* Patch #12630: Russian "x_hours" translation
+
+== 2012-12-18 v2.2.0
+
+* Defect #4787: Gannt to PNG - CJK (Chinese, Japanese and Korean) characters appear as ?
+* Defect #8106: Issues by Category should show tasks without category
+* Defect #8373: i18n string text_are_you_sure_with_children no longer used
+* Defect #11426: Filtering with Due Date in less than N days should show overdue issues
+* Defect #11834: Bazaar: "???" instead of non ASCII character in paths on non UTF-8 locale
+* Defect #11868: Git and Mercurial diff displays deleted files as /dev/null
+* Defect #11979: No validation errors when entering an invalid "Parent task"
+* Defect #12012: Redmine::VERSION.revision method does not work on Subversion 1.7 working copy
+* Defect #12018: Issue filter select box order changes randomly
+* Defect #12090: email recipients not written to action_mailer log if BCC recipients setting is checked
+* Defect #12092: Issue "start date" validation does not work correctly
+* Defect #12285: Some unit and functional tests miss fixtures and break when run alone
+* Defect #12286: Emails of private notes are sent to watcher users regardless of viewing permissions
+* Defect #12310: Attachments may not be displayed in the order they were selected
+* Defect #12356: Issue "Update" link broken focus
+* Defect #12397: Error in Textile conversion of HTTP links, containing russian letters
+* Defect #12434: Respond with 404 instead of 500 when requesting a wiki diff with invalid versions
+* Feature #1554: Private comments in tickets
+* Feature #2161: Time tracking code should respect weekends as "no work" days
+* Feature #3239: Show related issues on the Issues Listing
+* Feature #3265: Filter on issue relations
+* Feature #3447: Option to display the issue descriptions on the issues list
+* Feature #3511: Ability to sort issues by grouped column
+* Feature #4590: Precede-Follow relation should move following issues when rescheduling issue earlier
+* Feature #5487: Allow subtasks to cross projects
+* Feature #6899: Add a relation between the original and copied issue
+* Feature #7082: Rest API for wiki
+* Feature #9835: REST API - List priorities
+* Feature #10789: Macros {{child_pages}} with depth parameter
+* Feature #10852: Ability to delete a version from a wiki page history
+* Feature #10937: new user format #{lastname}
+* Feature #11502: Expose roles details via REST API
+* Feature #11755: Impersonate user through REST API auth
+* Feature #12085: New user name format: firstname + first letter of lastname
+* Feature #12125: Set filename used to store attachment updloaded via the REST API
+* Feature #12167: Macro for inserting collapsible block of text
+* Feature #12211: Wrap issue description and its contextual menu in a div
+* Feature #12216: Textual CSS class for priorities
+* Feature #12299: Redmine version requirement improvements (in plugins)
+* Feature #12393: Upgrade to Rails 3.2.9
+* Feature #12475: Lazy loading of translation files for faster startup
+* Patch #11846: Fill username when authentification failed
+* Patch #11862: Add "last 2 weeks" preset to time entries reporting
+* Patch #11992: Japanese translation about issue relations improved
+* Patch #12027: Incorrect Spanish "September" month name
+* Patch #12061: Japanese translation improvement (permission names)
+* Patch #12078: User#allowed_to? should return true or false
+* Patch #12117: Change Japanese translation of "admin"
+* Patch #12142: Updated translation in Lithuanian
+* Patch #12232: German translation enhancements
+* Patch #12316: Fix Lithuanian numeral translation
+* Patch #12494: Bulgarian "button_submit" translation change
+* Patch #12514: Updated translation in Lithuanian
+* Patch #12602: Korean translation update for 2.2-stable
+* Patch #12608: Norwegian translation changed
+* Patch #12619: Russian translation change
+
+== 2012-12-18 v2.1.5
+
+* Defect #12400: Validation fails when receiving an email with list custom fields
+* Defect #12451: Macros.rb extract_macro_options should use lazy search
+* Defect #12513: Grouping of issues by custom fields not correct in PDF export
+* Defect #12566: Issue history notes previews are broken
+* Defect #12568: Clicking "edit" on a journal multiple times shows multiple forms
+* Patch #12605: Norwegian translation for 1.4-stable update
+* Patch #12614: Dutch translation
+* Patch #12615: Russian translation
+
 == 2012-11-24 v2.1.4
 
 * Defect #12274: Wiki export from Index by title is truncated

lib/SVG/Graph/TimeSeries.rb

@@ -171,7 +171,7 @@ module SVG
       protected
 
       def min_x_value=(value)
-        @min_x_value = DateTime.parse( data[:data][i] ).to_time
+        @min_x_value = DateTime.parse( value ).to_time
       end
 
 

lib/plugins/rfpdf/lib/tcpdf.rb

@@ -403,6 +403,9 @@ class TCPDF
 			Error("Incorrect orientation: #{orientation}")
 		end
 
+    @fw = @w_pt/@k
+    @fh = @h_pt/@k
+    
 		@cur_orientation = @def_orientation
 		@w = @w_pt/@k
 		@h = @h_pt/@k
@@ -3615,9 +3618,9 @@ class TCPDF
 		restspace = GetPageHeight() - GetY() - GetBreakMargin();
 		
 		writeHTML(html, true, fill); # write html text
+    SetX(x)
 		
 		currentY =  GetY();
-		
 		@auto_page_break = false;
 		# check if a new page has been created
 		if (@page > pagenum)
@@ -3625,11 +3628,13 @@ class TCPDF
 			currentpage = @page;
 			@page = pagenum;
 			SetY(GetPageHeight() - restspace - GetBreakMargin());
+      SetX(x)
 			Cell(w, restspace - 1, "", b, 0, 'L', 0);
 			b = b2;
 			@page += 1;
 			while @page < currentpage
 				SetY(@t_margin); # put cursor at the beginning of text
+        SetX(x)
 				Cell(w, @page_break_trigger - @t_margin, "", b, 0, 'L', 0);
 				@page += 1;
 			end
@@ -3638,10 +3643,12 @@ class TCPDF
 			end
 			# design a cell around the text on last page
 			SetY(@t_margin); # put cursor at the beginning of text
+      SetX(x)
 			Cell(w, currentY - @t_margin, "", b, 0, 'L', 0);
 		else
 			SetY(y); # put cursor at the beginning of text
 			# design a cell around the text
+      SetX(x)
 			Cell(w, [h, (currentY - y)].max, "", border, 0, 'L', 0);
 		end
 		@auto_page_break = true;

lib/redmine.rb

@@ -198,7 +198,7 @@ Redmine::MenuManager.map :project_menu do |menu|
   menu.push :roadmap, { :controller => 'versions', :action => 'index' }, :param => :project_id,
               :if => Proc.new { |p| p.shared_versions.any? }
   menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural
-  menu.push :new_issue, { :controller => 'issues', :action => 'new' }, :param => :project_id, :caption => :label_issue_new,
+  menu.push :new_issue, { :controller => 'issues', :action => 'new', :copy_from => nil }, :param => :project_id, :caption => :label_issue_new,
               :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }
   menu.push :gantt, { :controller => 'gantts', :action => 'show' }, :param => :project_id, :caption => :label_gantt
   menu.push :calendar, { :controller => 'calendars', :action => 'show' }, :param => :project_id, :caption => :label_calendar

lib/redmine/export/pdf.rb

@@ -34,12 +34,12 @@ module Redmine
         include Redmine::I18n
         attr_accessor :footer_date
 
-        def initialize(lang)
+        def initialize(lang, orientation='P')
           @@k_path_cache = Rails.root.join('tmp', 'pdf')
           FileUtils.mkdir_p @@k_path_cache unless File::exist?(@@k_path_cache)
           set_language_if_valid lang
           pdf_encoding = l(:general_pdf_encoding).upcase
-          super('P', 'mm', 'A4', (pdf_encoding == 'UTF-8'), pdf_encoding)
+          super(orientation, 'mm', 'A4', (pdf_encoding == 'UTF-8'), pdf_encoding)
           case current_language.to_s.downcase
           when 'vi'
             @font_for_content = 'DejaVuSans'
@@ -236,7 +236,7 @@ module Redmine
 
       # fetch row values
       def fetch_row_values(issue, query, level)
-        query.columns.collect do |column|
+        query.inline_columns.collect do |column|
           s = if column.is_a?(QueryCustomFieldColumn)
             cv = issue.custom_field_values.detect {|v| v.custom_field_id == column.custom_field.id}
             show_value(cv)
@@ -263,10 +263,10 @@ module Redmine
         #  by captions
         pdf.SetFontStyle('B',8)
         col_padding = pdf.GetStringWidth('OO')
-        col_width_min = query.columns.map {|v| pdf.GetStringWidth(v.caption) + col_padding}
+        col_width_min = query.inline_columns.map {|v| pdf.GetStringWidth(v.caption) + col_padding}
         col_width_max = Array.new(col_width_min)
         col_width_avg = Array.new(col_width_min)
-        word_width_max = query.columns.map {|c|
+        word_width_max = query.inline_columns.map {|c|
           n = 10
           c.caption.split.each {|w|
             x = pdf.GetStringWidth(w) + col_padding
@@ -370,13 +370,13 @@ module Redmine
         # render it background to find the max height used
         base_x = pdf.GetX
         base_y = pdf.GetY
-        max_height = issues_to_pdf_write_cells(pdf, query.columns, col_width, row_height, true)
+        max_height = issues_to_pdf_write_cells(pdf, query.inline_columns, col_width, row_height, true)
         pdf.Rect(base_x, base_y, table_width + col_id_width, max_height, 'FD');
         pdf.SetXY(base_x, base_y);
 
         # write the cells on page
         pdf.RDMCell(col_id_width, row_height, "#", "T", 0, 'C', 1)
-        issues_to_pdf_write_cells(pdf, query.columns, col_width, row_height, true)
+        issues_to_pdf_write_cells(pdf, query.inline_columns, col_width, row_height, true)
         issues_to_pdf_draw_borders(pdf, base_x, base_y, base_y + max_height, col_id_width, col_width)
         pdf.SetY(base_y + max_height);
 
@@ -387,7 +387,7 @@ module Redmine
 
       # Returns a PDF string of a list of issues
       def issues_to_pdf(issues, project, query)
-        pdf = ITCPDF.new(current_language)
+        pdf = ITCPDF.new(current_language, "L")
         title = query.new_record? ? l(:label_issue_plural) : query.name
         title = "#{project} - #{title}" if project
         pdf.SetTitle(title)
@@ -407,11 +407,17 @@ module Redmine
         # column widths
         table_width = page_width - right_margin - 10  # fixed left margin
         col_width = []
-        unless query.columns.empty?
+        unless query.inline_columns.empty?
           col_width = calc_col_width(issues, query, table_width - col_id_width, pdf)
           table_width = col_width.inject(0) {|s,v| s += v}
         end
 
+				# use full width if the description is displayed
+        if table_width > 0 && query.has_column?(:description)
+          col_width = col_width.map {|w| w = w * (page_width - right_margin - 10 - col_id_width) / table_width}
+          table_width = col_width.inject(0) {|s,v| s += v}
+        end
+
         # title
         pdf.SetFontStyle('B',11)
         pdf.RDMCell(190,10, title)
@@ -422,7 +428,7 @@ module Redmine
           if query.grouped? &&
                (group = query.group_by_column.value(issue)) != previous_group
             pdf.SetFontStyle('B',10)
-            group_label = group.blank? ? 'None' : group.to_s
+            group_label = group.blank? ? 'None' : group.to_s.dup
             group_label << " (#{query.issue_count_by_group[group]})"
             pdf.Bookmark group_label, 0, -1
             pdf.RDMCell(table_width + col_id_width, row_height * 2, group_label, 1, 1, 'L')
@@ -454,6 +460,13 @@ module Redmine
           issues_to_pdf_write_cells(pdf, col_values, col_width, row_height)
           issues_to_pdf_draw_borders(pdf, base_x, base_y, base_y + max_height, col_id_width, col_width)
           pdf.SetY(base_y + max_height);
+
+          if query.has_column?(:description) && issue.description?
+            pdf.SetX(10)
+            pdf.SetAutoPageBreak(true, 20)
+            pdf.RDMwriteHTMLCell(0, 5, 10, 0, issue.description.to_s, issue.attachments, "LRBT")
+            pdf.SetAutoPageBreak(false)
+          end
         end
 
         if issues.size == Setting.issues_export_limit.to_i

lib/redmine/version.rb

@@ -4,13 +4,13 @@ module Redmine
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 2
-    TINY  = 0
+    TINY  = 1
 
     # Branch values:
     # * official release: nil
     # * stable branch:    stable
     # * trunk:            devel
-    BRANCH = 'devel'
+    BRANCH = 'stable'
 
     # Retrieves the revision from the working copy
     def self.revision

lib/redmine/wiki_formatting/macros.rb

@@ -147,10 +147,10 @@ module Redmine
           unless block_given?
             raise "Can not create a macro without a block!"
           end
-          name = name.to_sym if name.is_a?(String)
+          name = name.to_s.downcase.to_sym
           available_macros[name] = {:desc => @@desc || ''}.merge(options)
           @@desc = nil
-          Definitions.send :define_method, "macro_#{name}".downcase, &block
+          Definitions.send :define_method, "macro_#{name}", &block
         end
 
         # Sets description for the next macro to be defined

public/help/wiki_syntax_detailed.html

@@ -169,7 +169,7 @@ http://www.redmine.org, someone@foo.bar
     <h2><a name="5" class="wiki-page"></a>Text formatting</h2>
 
 
-    <p>For things such as headlines, bold, tables, lists, Redmine supports Textile syntax.  See <a class="external" href="http://www.textism.com/tools/textile/">http://www.textism.com/tools/textile/</a> for information on using any of these features.  A few samples are included below, but the engine is capable of much more of that.</p>
+    <p>For things such as headlines, bold, tables, lists, Redmine supports Textile syntax.  See <a class="external" href="http://en.wikipedia.org/wiki/Textile_%28markup_language%29">http://en.wikipedia.org/wiki/Textile_(markup_language)</a> for information on using any of these features.  A few samples are included below, but the engine is capable of much more of that.</p>
 
         <h3><a name="6" class="wiki-page"></a>Font style</h3>
 

public/stylesheets/application.css

@@ -149,6 +149,8 @@ tr.issue td.subject, tr.issue td.category, td.assigned_to, tr.issue td.string, t
 tr.issue td.subject, tr.issue td.relations { text-align: left; }
 tr.issue td.done_ratio table.progress { margin-left:auto; margin-right: auto;}
 tr.issue td.relations span {white-space: nowrap;}
+table.issues td.description {color:#777; font-size:90%; padding:4px 4px 4px 24px; text-align:left; white-space:normal;}
+table.issues td.description pre {white-space:normal;}
 
 tr.issue.idnt td.subject a {background: url(../images/bullet_arrow_right.png) no-repeat 0 50%; padding-left: 16px;}
 tr.issue.idnt-1 td.subject {padding-left: 0.5em;}

test/fixtures/mail_handler/ticket_with_custom_fields.eml

@@ -39,3 +39,4 @@ pulvinar dui, a gravida orci mi eget odio. Nunc a lacus.
 
 category: Stock management
 searchable field: Value for a custom field
+Database:  postgresql

test/functional/activities_controller_test.rb

@@ -37,7 +37,7 @@ class ActivitiesControllerTest < ActionController::TestCase
   end
 
   def test_previous_project_index
-    get :index, :id => 1, :from => 3.days.ago.to_date
+    get :index, :id => 1, :from => 2.days.ago.to_date
     assert_response :success
     assert_template 'index'
     assert_not_nil assigns(:events_by_day)

test/functional/issues_controller_test.rb

@@ -422,7 +422,7 @@ class IssuesControllerTest < ActionController::TestCase
     assert_equal 'text/csv; header=present', @response.content_type
     assert @response.body.starts_with?("#,")
     lines = @response.body.chomp.split("\n")
-    assert_equal assigns(:query).available_columns.size + 1, lines[0].split(',').size
+    assert_equal assigns(:query).available_inline_columns.size + 1, lines[0].split(',').size
   end
 
   def test_index_csv_with_multi_column_field
@@ -829,6 +829,17 @@ class IssuesControllerTest < ActionController::TestCase
     assert_equal 'application/pdf', response.content_type
   end
 
+  def test_index_with_description_column
+    get :index, :set_filter => 1, :c => %w(subject description)
+
+    assert_select 'table.issues thead th', 3 # columns: chekbox + id + subject
+    assert_select 'td.description[colspan=3]', :text => 'Unable to print recipes'
+
+    get :index, :set_filter => 1, :c => %w(subject description), :format => 'pdf'
+    assert_response :success
+    assert_equal 'application/pdf', response.content_type
+  end
+
   def test_index_send_html_if_query_is_invalid
     get :index, :f => ['start_date'], :op => {:start_date => '='}
     assert_equal 'text/html', @response.content_type
@@ -2345,6 +2356,9 @@ class IssuesControllerTest < ActionController::TestCase
     assert_tag 'select', :attributes => {:name => 'issue[project_id]'},
       :child => {:tag => 'option', :attributes => {:value => '2', :selected => nil}, :content => 'OnlineStore'}
     assert_tag 'input', :attributes => {:name => 'copy_from', :value => '1'}
+
+    # "New issue" menu item should not link to copy
+    assert_select '#main-menu a.new-issue[href=/projects/ecookbook/issues/new]'
   end
 
   def test_new_as_copy_with_attachments_should_show_copy_attachments_checkbox

test/functional/previews_controller_test.rb

@@ -48,7 +48,7 @@ class PreviewsControllerTest < ActionController::TestCase
 
   def test_preview_journal_notes_for_update
     @request.session[:user_id] = 2
-    post :issue, :project_id => '1', :id => 1, :issue => {:notes => 'Foo'}
+    post :issue, :project_id => '1', :id => 1, :notes => 'Foo'
     assert_response :success
     assert_template 'preview'
     assert_not_nil assigns(:notes)

test/unit/custom_field_test.rb

@@ -218,4 +218,9 @@ class CustomFieldTest < ActiveSupport::TestCase
     assert_nil CustomField.new(:field_format => 'text').value_class
     assert_nil CustomField.new.value_class
   end
+
+  def test_value_from_keyword_for_list_custom_field
+    field = CustomField.find(1)
+    assert_equal 'PostgreSQL', field.value_from_keyword('postgresql', Issue.find(1))
+  end
 end

test/unit/lib/redmine/wiki_formatting/macros_test.rb

@@ -78,6 +78,12 @@ class Redmine::WikiFormatting::MacrosTest < ActionView::TestCase
     assert_equal "<p>Baz: (arg1,arg2) (String) (line1\nline2)</p>", textilizable("{{baz(arg1, arg2)\nline1\nline2\n}}")
   end
 
+  def test_macro_name_with_upper_case
+    Redmine::WikiFormatting::Macros.macro(:UpperCase) {|obj, args| "Upper"}
+
+    assert_equal "<p>Upper</p>", textilizable("{{UpperCase}}")
+  end
+
   def test_multiple_macros_on_the_same_line
     Redmine::WikiFormatting::Macros.macro :foo do |obj, args|
       args.any? ? "args: #{args.join(',')}" : "no args" 

test/unit/mail_handler_test.rb

@@ -177,8 +177,8 @@ class MailHandlerTest < ActiveSupport::TestCase
     assert !issue.new_record?
     issue.reload
     assert_equal 'New ticket with custom field values', issue.subject
-    assert_equal 'Value for a custom field',
-                 issue.custom_value_for(CustomField.find_by_name('Searchable field')).value
+    assert_equal 'PostgreSQL', issue.custom_field_value(1)
+    assert_equal 'Value for a custom field', issue.custom_field_value(2)
     assert !issue.description.match(/^searchable field:/i)
   end
 

test/unit/query_test.rb

@@ -737,7 +737,9 @@ class QueryTest < ActiveSupport::TestCase
 
   def test_default_columns
     q = Query.new
-    assert !q.columns.empty?
+    assert q.columns.any?
+    assert q.inline_columns.any?
+    assert q.block_columns.empty?
   end
 
   def test_set_column_names
@@ -748,6 +750,21 @@ class QueryTest < ActiveSupport::TestCase
     assert q.has_column?(c)
   end
 
+  def test_inline_and_block_columns
+    q = Query.new
+    q.column_names = ['subject', 'description', 'tracker']
+
+    assert_equal [:subject, :tracker], q.inline_columns.map(&:name)
+    assert_equal [:description], q.block_columns.map(&:name)
+  end
+
+  def test_custom_field_columns_should_be_inline
+    q = Query.new
+    columns = q.available_columns.select {|column| column.is_a? QueryCustomFieldColumn}
+    assert columns.any?
+    assert_nil columns.detect {|column| !column.inline?}
+  end
+
   def test_query_should_preload_spent_hours
     q = Query.new(:name => '_', :column_names => [:subject, :spent_hours])
     assert q.has_column?(:spent_hours)