distance_in_words.patch

requested at 25402#note-2 - Greg T, 2017-03-23 10:33

Download (26.1 KB)

View differences:

app/helpers/settings_helper.rb (working copy)
132 132
  def session_lifetime_options
133 133
    options = [[l(:label_disabled), 0]]
134 134
    options += [4, 8, 12].map {|hours|
135
      [l('datetime.distance_in_words.x_hours', :count => hours), (hours * 60).to_s]
135
      [l('datetime.x_hours', :count => hours), (hours * 60).to_s]
136 136
    }
137 137
    options += [1, 7, 30, 60, 365].map {|days|
138
      [l('datetime.distance_in_words.x_days', :count => days), (days * 24 * 60).to_s]
138
      [l('datetime.x_days', :count => days), (days * 24 * 60).to_s]
139 139
    }
140 140
    options
141 141
  end
......
143 143
  def session_timeout_options
144 144
    options = [[l(:label_disabled), 0]]
145 145
    options += [1, 2, 4, 8, 12, 24, 48].map {|hours|
146
      [l('datetime.distance_in_words.x_hours', :count => hours), (hours * 60).to_s]
146
      [l('datetime.x_hours', :count => hours), (hours * 60).to_s]
147 147
    }
148 148
    options
149 149
  end
app/models/issue_relation.rb (working copy)
156 156
    issue_text = block_given? ? yield(other_issue(issue)) : "##{other_issue(issue).try(:id)}"
157 157
    s = []
158 158
    s << l(label_for(issue))
159
    s << "(#{l('datetime.distance_in_words.x_days', :count => delay)})" if delay && delay != 0
159
    s << "(#{l('datetime.x_days', :count => delay)})" if delay && delay != 0
160 160
    s << issue_text
161 161
    s.join(' ')
162 162
  end
app/views/settings/_authentication.html.erb (working copy)
3 3
<div class="box tabular settings">
4 4
<p><%= setting_check_box :login_required %></p>
5 5

  
6
<p><%= setting_select :autologin, [[l(:label_disabled), 0]] + [1, 7, 30, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), days.to_s]} %></p>
6
<p><%= setting_select :autologin, [[l(:label_disabled), 0]] + [1, 7, 30, 365].collect{|days| [l('datetime.x_days', :count => days), days.to_s]} %></p>
7 7

  
8 8
<p><%= setting_select :self_registration, [[l(:label_disabled), "0"],
9 9
                                           [l(:label_registration_activation_by_email), "1"],
......
15 15
<p><%= setting_text_field :password_min_length, :size => 6 %></p>
16 16

  
17 17
<p>
18
  <%= setting_select :password_max_age, [[l(:label_disabled), 0]] + [7, 30, 60, 90, 180, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), days.to_s]} %>
18
  <%= setting_select :password_max_age, [[l(:label_disabled), 0]] + [7, 30, 60, 90, 180, 365].collect{|days| [l('datetime.x_days', :count => days), days.to_s]} %>
19 19
</p>
20 20

  
21 21
<p><%= setting_check_box :lost_password %></p>
config/locales/ar.yml (working copy)
32 32
    pm: "مساءاً"
33 33

  
34 34
  datetime:
35
    x_hours:
36
      one:   "%{count} ساعة"
37
      other: "%{count} ساعات"
38
    x_days:
39
      one:   "يوم"
40
      other: "%{count} أيام"
35 41
    distance_in_words:
36 42
      half_a_minute: "نصف دقيقة"
37 43
      less_than_x_seconds:
config/locales/az.yml (working copy)
81 81
          tb: "TB"
82 82

  
83 83
  datetime:
84
    x_hours:
85
      one:   "1 saat"
86
      other: "%{count} saat"
87
    x_days:
88
      one:   "%{count} gün"
89
      few:   "%{count} gün"
90
      many:  "%{count} gün"
91
      other: "%{count} gün"
84 92
    distance_in_words:
85 93
      half_a_minute: "bir dəqiqədən az"
86 94
      less_than_x_seconds:
config/locales/bg.yml (working copy)
33 33
    pm: "pm"
34 34

  
35 35
  datetime:
36
    x_hours:
37
      one:   "1 час"
38
      other: "%{count} часа"
39
    x_days:
40
      one:   "1 ден"
41
      other: "%{count} дена"
36 42
    distance_in_words:
37 43
      half_a_minute: "half a minute"
38 44
      less_than_x_seconds:
config/locales/bs.yml (working copy)
31 31
    pm: "poslijepodne"
32 32

  
33 33
  datetime:
34
    x_hours:
35
      one:   "1 sahat"
36
      other: "%{count} sahata"
37
    x_days:
38
      one:   "1 dan"
39
      other: "%{count} dana"
34 40
    distance_in_words:
35 41
      half_a_minute: "pola minute"
36 42
      less_than_x_seconds:
config/locales/ca.yml (working copy)
36 36
    pm: "pm"
37 37

  
38 38
  datetime:
39
    x_hours:
40
      one:   "1 hora"
41
      other: "%{count} hores"
42
    x_days:
43
      one:   "1 dia"
44
      other: "%{count} dies"
39 45
    distance_in_words:
40 46
      half_a_minute: "mig minut"
41 47
      less_than_x_seconds:
config/locales/cs.yml (working copy)
37 37
    pm: "odp."
38 38

  
39 39
  datetime:
40
    x_hours:
41
      one:   "1 hodina"
42
      other: "%{count} hodin"
43
    x_days:
44
      one:   "1 den"
45
      other: "%{count} dnů"
40 46
    distance_in_words:
41 47
      half_a_minute: "půl minuty"
42 48
      less_than_x_seconds:
config/locales/da.yml (working copy)
34 34
      skip_last_comma: true
35 35

  
36 36
  datetime:
37
    x_hours:
38
      one:   "1 time"
39
      other: "%{count} timer"
40
    x_days:
41
      one:  "en dag"
42
      other: "%{count} dage"
37 43
    distance_in_words:
38 44
      half_a_minute: "et halvt minut"
39 45
      less_than_x_seconds:
config/locales/de.yml (working copy)
35 35
    pm: "nachmittags"
36 36

  
37 37
  datetime:
38
    x_hours:
39
      one:   "1 Stunde"
40
      other: "%{count} Stunden"
41
    x_days:
42
      one: '1 Tag'
43
      other: '%{count} Tagen'
38 44
    distance_in_words:
39 45
      half_a_minute: 'eine halbe Minute'
40 46
      less_than_x_seconds:
config/locales/el.yml (working copy)
34 34
    pm: "μμ"
35 35

  
36 36
  datetime:
37
    x_hours:
38
      one:   "1 ώρα"
39
      other: "%{count} ώρες"
40
    x_days:
41
      one:   "1 ημέρα"
42
      other: "%{count} ημέρες"
37 43
    distance_in_words:
38 44
      half_a_minute: "μισό λεπτό"
39 45
      less_than_x_seconds:
config/locales/en-GB.yml (working copy)
31 31
    pm: "pm"
32 32

  
33 33
  datetime:
34
    x_hours:
35
      one:   "1 hour"
36
      other: "%{count} hours"
37
    x_days:
38
      one:   "1 day"
39
      other: "%{count} days"
34 40
    distance_in_words:
35 41
      half_a_minute: "half a minute"
36 42
      less_than_x_seconds:
config/locales/en.yml (working copy)
32 32
    pm: "pm"
33 33

  
34 34
  datetime:
35
    x_hours:
36
      one:   "1 hour"
37
      other: "%{count} hours"
38
    x_days:
39
      one:   "1 day"
40
      other: "%{count} days"
35 41
    distance_in_words:
36 42
      half_a_minute: "half a minute"
37 43
      less_than_x_seconds:
config/locales/es-PA.yml (working copy)
65 65

  
66 66
  # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
67 67
  datetime:
68
    x_hours:
69
      one:   "1 hora"
70
      other: "%{count} horas"
71
    x_days:
72
      one:  "1 día"
73
      other: "%{count} días"
68 74
    distance_in_words:
69 75
      half_a_minute: "medio minuto"
70 76
      less_than_x_seconds:
config/locales/es.yml (working copy)
63 63

  
64 64
  # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
65 65
  datetime:
66
    x_hours:
67
      one:   "1 hora"
68
      other: "%{count} horas"
69
    x_days:
70
      one:  "1 día"
71
      other: "%{count} días"
66 72
    distance_in_words:
67 73
      half_a_minute: "medio minuto"
68 74
      less_than_x_seconds:
config/locales/et.yml (working copy)
49 49
    pm: "peale lõunat"
50 50

  
51 51
  datetime:
52
    x_hours:
53
      one:   "1 tund"
54
      other: "%{count} tundi"
55
    x_days:
56
      one:   "1 päev"
57
      other: "%{count} päeva"
52 58
    distance_in_words:
53 59
      half_a_minute: "pool minutit"
54 60
      less_than_x_seconds:
config/locales/eu.yml (working copy)
35 35
    pm: "pm"
36 36

  
37 37
  datetime:
38
    x_hours:
39
      one:   "ordu 1"
40
      other: "%{count} ordu"
41
    x_days:
42
      one:   "egun 1"
43
      other: "%{count} egun"
38 44
    distance_in_words:
39 45
      half_a_minute: "minutu erdi"
40 46
      less_than_x_seconds:
config/locales/fa.yml (working copy)
32 32
    pm: "عصر"
33 33

  
34 34
  datetime:
35
    x_hours:
36
      one:   "1 ساعت"
37
      other: "%{count} ساعت"
38
    x_days:
39
      one:   "1 روز"
40
      other: "%{count} روز"
35 41
    distance_in_words:
36 42
      half_a_minute: "نیم دقیقه"
37 43
      less_than_x_seconds:
config/locales/fi.yml (working copy)
77 77
          tb: "TB"
78 78

  
79 79
  datetime:
80
    x_hours:
81
      one:   "1 tunti"
82
      other: "%{count} tuntia"
83
    x_days:
84
      one:   "päivä"
85
      other: "%{count} päivää"
80 86
    distance_in_words:
81 87
      half_a_minute: "puoli minuuttia"
82 88
      less_than_x_seconds:
config/locales/fr.yml (working copy)
37 37
    pm: 'pm'
38 38

  
39 39
  datetime:
40
    x_hours:
41
      one:   "une heure"
42
      other: "%{count} heures"
43
    x_days:
44
      one:   "un jour"
45
      other: "%{count} jours"
40 46
    distance_in_words:
41 47
      half_a_minute: "30 secondes"
42 48
      less_than_x_seconds:
config/locales/gl.yml (working copy)
72 72
    pm: ''
73 73

  
74 74
  datetime:
75
    x_hours:
76
      one:   "1 hora"
77
      other: "%{count} horas"
78
    x_days:
79
      one: '1 día'
80
      other: '%{count} días'
75 81
    distance_in_words:
76 82
      half_a_minute: 'medio minuto'
77 83
      less_than_x_seconds:
config/locales/he.yml (working copy)
36 36
    pm: 'pm'
37 37

  
38 38
  datetime:
39
    x_hours:
40
      one:   "1 שעה"
41
      other: "%{count} שעות"
42
    x_days:
43
      one: 'יום אחד'
44
      other: '%{count} ימים'
39 45
    distance_in_words:
40 46
      half_a_minute: 'חצי דקה'
41 47
      less_than_x_seconds:
config/locales/hr.yml (working copy)
31 31
    pm: "pm"
32 32

  
33 33
  datetime:
34
    x_hours:
35
      one:   "1 sata"
36
      other: "%{count} sati"
37
    x_days:
38
      one:   "1 dan"
39
      other: "%{count} dana"
34 40
    distance_in_words:
35 41
      half_a_minute: "pola minute"
36 42
      less_than_x_seconds:
config/locales/hu.yml (working copy)
31 31
    pm: "du."
32 32

  
33 33
  datetime:
34
    x_hours:
35
      one:   "1 óra"
36
      other: "%{count} óra"
37
    x_days:
38
      one: '1 nap'
39
      other: '%{count} nap'
34 40
    distance_in_words:
35 41
      half_a_minute: 'fél perc'
36 42
      less_than_x_seconds:
......
51 57
        one: 'csaknem 1 órája'
52 58
        other: 'csaknem %{count} órája'
53 59
      x_hours:
54
        one:   "1 óra"
55
        other: "%{count} óra"
60
        one:   "1 órája"
61
        other: "%{count} órája"
56 62
      x_days:
57 63
        one: '1 napja'
58 64
        other: '%{count} napja'
config/locales/id.yml (working copy)
29 29
    pm: "pm"
30 30

  
31 31
  datetime:
32
    x_hours:
33
      one:   "1 jam"
34
      other: "%{count} jam"
35
    x_days:
36
      one:   "sehari"
37
      other: "%{count} hari"
32 38
    distance_in_words:
33 39
      half_a_minute: "setengah menit"
34 40
      less_than_x_seconds:
config/locales/it.yml (working copy)
37 37
    pm: 'pm'
38 38

  
39 39
  datetime:
40
    x_hours:
41
      one:   "1 ora"
42
      other: "%{count} ore"
43
    x_days:
44
      one:  "1 giorno"
45
      other: "%{count} giorni"
40 46
    distance_in_words:
41 47
      half_a_minute: "mezzo minuto"
42 48
      less_than_x_seconds:
config/locales/ja.yml (working copy)
35 35
    pm: "午後"
36 36

  
37 37
  datetime:
38
    x_hours:
39
      one:   "1時間"
40
      other: "%{count}時間"
41
    x_days:
42
      one:   "1日"
43
      other: "%{count}日"
38 44
    distance_in_words:
39 45
      half_a_minute: "30秒前後"
40 46
      less_than_x_seconds:
config/locales/ko.yml (working copy)
32 32
    pm: "오후"
33 33

  
34 34
  datetime:
35
    x_hours:
36
      one:   "1 시간"
37
      other: "%{count} 시간"
38
    x_days:
39
      one:   "하루"
40
      other: "%{count}일"
35 41
    distance_in_words:
36 42
      half_a_minute: "30초"
37 43
      less_than_x_seconds:
config/locales/lt.yml (working copy)
39 39
    pm: "vakaro"
40 40

  
41 41
  datetime:
42
    x_hours:
43
      one:  "1 valanda"
44
      other: "%{count} valandų(os)"
45
    x_days:
46
      one: "1 diena"
47
      other: "%{count} dienų(os)"
42 48
    distance_in_words:
43 49
      half_a_minute: "pusė minutės"
44 50
      less_than_x_seconds:
config/locales/lv.yml (working copy)
28 28
    pm: "vakarā"
29 29

  
30 30
  datetime:
31
    x_hours:
32
      one:   "1 stunda"
33
      other: "%{count} stundas"
34
    x_days:
35
      one:   "1 diena"
36
      other: "%{count} dienas"
31 37
    distance_in_words:
32 38
      half_a_minute: "pus minūte"
33 39
      less_than_x_seconds:
config/locales/mk.yml (working copy)
32 32
    pm: "попладне"
33 33

  
34 34
  datetime:
35
    x_hours:
36
      one:   "1 час"
37
      other: "%{count} часа"
38
    x_days:
39
      one:   "1 ден"
40
      other: "%{count} дена"
35 41
    distance_in_words:
36 42
      half_a_minute: "пола минута"
37 43
      less_than_x_seconds:
config/locales/mn.yml (working copy)
33 33
    pm: "pm"
34 34

  
35 35
  datetime:
36
    x_hours:
37
      one:   "1 цаг"
38
      other: "%{count} цаг"
39
    x_days:
40
      one:   "1 өдөр"
41
      other: "%{count} өдөр"
36 42
    distance_in_words:
37 43
      half_a_minute: "хагас минут"
38 44
      less_than_x_seconds:
config/locales/nl.yml (working copy)
31 31
    pm: "pm"
32 32

  
33 33
  datetime:
34
    x_hours:
35
      one:   "1 uur"
36
      other: "%{count} uren"
37
    x_days:
38
      one:   "1 dag"
39
      other: "%{count} dagen"
34 40
    distance_in_words:
35 41
      half_a_minute: "halve minuut"
36 42
      less_than_x_seconds:
config/locales/no.yml (working copy)
26 26
    am: ""
27 27
    pm: ""
28 28
  datetime:
29
    x_hours:
30
      one:   "1 time"
31
      other: "%{count} timer"
32
    x_days:
33
      one: "1 dag"
34
      other: "%{count} dager"
29 35
    distance_in_words:
30 36
      half_a_minute: "et halvt minutt"
31 37
      less_than_x_seconds:
config/locales/pl.yml (working copy)
60 60
    pm: "po południu"
61 61

  
62 62
  datetime:
63
    x_hours:
64
      one:   "1 godzina"
65
      other: "%{count} godzin"
66
    x_days:
67
      one:   "1 dzień"
68
      other: "%{count} dni"
63 69
    distance_in_words:
64 70
      half_a_minute: "pół minuty"
65 71
      less_than_x_seconds:
config/locales/pt-BR.yml (working copy)
31 31

  
32 32
  # date helper distancia em palavras
33 33
  datetime:
34
    x_hours:
35
      one:   "1 hora"
36
      other: "%{count} horas"
37

  
38
    x_days:
39
      one: '1 dia'
40
      other: '%{count} dias'
41

  
34 42
    distance_in_words:
35 43
      half_a_minute: 'meio minuto'
36 44
      less_than_x_seconds:
config/locales/pt.yml (working copy)
35 35
    pm: 'pm'
36 36

  
37 37
  datetime:
38
    x_hours:
39
      one:   "1 hora"
40
      other: "%{count} horas"
41
    x_days:
42
      one: "1 dia"
43
      other: "%{count} dias"
38 44
    distance_in_words:
39 45
      half_a_minute: "meio minuto"
40 46
      less_than_x_seconds:
config/locales/ro.yml (working copy)
27 27
    pm: "pm"
28 28

  
29 29
  datetime:
30
    x_hours:
31
      one:   "1 oră"
32
      other: "%{count} ore"
33
    x_days:
34
      one:   "o zi"
35
      other: "%{count} zile"
30 36
    distance_in_words:
31 37
      half_a_minute: "jumătate de minut"
32 38
      less_than_x_seconds:
config/locales/ru.yml (working copy)
89 89
          tb: "ТБ"
90 90

  
91 91
  datetime:
92
    x_hours:
93
      one:   "%{count} час"
94
      few:   "%{count} часа"
95
      many:  "%{count} часов"
96
      other: "%{count} часа"
97
    x_days:
98
      one:   "%{count} день"
99
      few:   "%{count} дня"
100
      many:  "%{count} дней"
101
      other: "%{count} дня"
92 102
    distance_in_words:
93 103
      half_a_minute: "меньше минуты"
94 104
      less_than_x_seconds:
config/locales/sk.yml (working copy)
31 31
    pm: "popoludní"
32 32

  
33 33
  datetime:
34
    x_hours:
35
      one:   "1 hodina"
36
      other: "%{count} hodín"
37
    x_days:
38
      one:   "1 deň"
39
      other: "%{count} dní"
34 40
    distance_in_words:
35 41
      half_a_minute: "pol minúty"
36 42
      less_than_x_seconds:
config/locales/sl.yml (working copy)
32 32
    pm: "pm"
33 33

  
34 34
  datetime:
35
    x_hours:
36
      one:   "1 ura"
37
      other: "%{count} ur"
38
    x_days:
39
      one:   "1 dan"
40
      other: "%{count} dni"
35 41
    distance_in_words:
36 42
      half_a_minute: "pol minute"
37 43
      less_than_x_seconds:
config/locales/sq.yml (working copy)
32 32
    pm: "pm"
33 33

  
34 34
  datetime:
35
    x_hours:
36
      one:   "1 ore"
37
      other: "%{count} ore"
38
    x_days:
39
      one:   "1 day"
40
      other: "%{count} days"
35 41
    distance_in_words:
36 42
      half_a_minute: "half a minute"
37 43
      less_than_x_seconds:
config/locales/sr-YU.yml (working copy)
35 35
    pm: "pm"
36 36

  
37 37
  datetime:
38
    x_hours:
39
      one:   "1 sat"
40
      other: "%{count} sati"
41
    x_days:
42
      one:   "jedan dan"
43
      other: "%{count} dana"
38 44
    distance_in_words:
39 45
      half_a_minute: "pola minuta"
40 46
      less_than_x_seconds:
config/locales/sr.yml (working copy)
33 33
    pm: "pm"
34 34

  
35 35
  datetime:
36
    x_hours:
37
      one:   "1 сат"
38
      other: "%{count} сати"
39
    x_days:
40
      one:   "један дан"
41
      other: "%{count} дана"
36 42
    distance_in_words:
37 43
      half_a_minute: "пола минута"
38 44
      less_than_x_seconds:
config/locales/sv.yml (working copy)
61 61

  
62 62
  # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
63 63
  datetime:
64
    x_hours:
65
      one:   "1 timme"
66
      other: "%{count} timmar"
67
    x_days:
68
      one:   "en dag"
69
      other: "%{count} dagar"
64 70
    distance_in_words:
65 71
      half_a_minute: "en halv minut"
66 72
      less_than_x_seconds:
config/locales/th.yml (working copy)
31 31
    pm: "pm"
32 32

  
33 33
  datetime:
34
    x_hours:
35
      one:   "1 hour"
36
      other: "%{count} hours"
37
    x_days:
38
      one:   "1 day"
39
      other: "%{count} days"
34 40
    distance_in_words:
35 41
      half_a_minute: "half a minute"
36 42
      less_than_x_seconds:
config/locales/tr.yml (working copy)
32 32
    pm: "öğleden sonra"
33 33

  
34 34
  datetime:
35
    x_hours:
36
      one:   "1 saat"
37
      other: "%{count} saat"
38
    x_days:
39
      one: '1 gün'
40
      other: '%{count} gün'
35 41
    distance_in_words:
36 42
      half_a_minute: 'yarım dakika'
37 43
      less_than_x_seconds:
config/locales/uk.yml (working copy)
31 31
    pm: "вечора"
32 32

  
33 33
  datetime:
34
    x_hours:
35
      one:   "1 година"
36
      few:   "%{count} години"
37
      many:  "%{count} годин"
38
      other: "%{count} години"
39
    x_days:
40
      one:   "1 день"
41
      few:   "%{count} дня"
42
      many:  "%{count} днів"
43
      other: "%{count} днів"
34 44
    distance_in_words:
35 45
      half_a_minute: "менше хвилини"
36 46
      less_than_x_seconds:
config/locales/vi.yml (working copy)
63 63

  
64 64
  # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
65 65
  datetime:
66
    x_hours:
67
      one:   "1 giờ"
68
      other: "%{count} giờ"
69
    x_days:
70
      one:   "1 ngày"
71
      other: "%{count} ngày"
66 72
    distance_in_words:
67 73
      half_a_minute: "30 giây"
68 74
      less_than_x_seconds:
config/locales/zh-TW.yml (working copy)
105 105

  
106 106
  # 使用於 distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
107 107
  datetime:
108
    x_hours:
109
      one:   "1 小時"
110
      other: "%{count} 小時"
111
    x_days:
112
      one: "1 天"
113
      other: "%{count} 天"
108 114
    distance_in_words:
109 115
      half_a_minute: "半分鐘"
110 116
      less_than_x_seconds:
config/locales/zh.yml (working copy)
36 36
    pm: "下午"
37 37

  
38 38
  datetime:
39
    x_hours:
40
      one:   "1 小时"
41
      other: "%{count} 小时"
42
    x_days:
43
      one: "一天"
44
      other: "%{count} 天"
39 45
    distance_in_words:
40 46
      half_a_minute: "半分钟"
41 47
      less_than_x_seconds: