Project

General

Profile

Defect #19017 » pdf_monospaced_font_r14882.patch

Jun NAITOH, 2015-11-21 06:43

View differences:

config/locales/lt.yml (working copy)
201 201
  general_csv_decimal_separator: '.'
202 202
  general_csv_encoding: UTF-8
203 203
  general_pdf_fontname: freesans
204
  general_pdf_monospaced_fontname: freemono
204 205
  general_first_day_of_week: '1'
205 206

  
206 207
  notice_account_updated: Paskyra buvo sėkmingai atnaujinta.
config/locales/sr-YU.yml (working copy)
145 145
  general_csv_decimal_separator: '.'
146 146
  general_csv_encoding: UTF-8
147 147
  general_pdf_fontname: freesans
148
  general_pdf_monospaced_fontname: freemono
148 149
  general_first_day_of_week: '1'
149 150

  
150 151
  notice_account_updated: Nalog je uspešno ažuriran.
config/locales/ro.yml (working copy)
137 137
  general_csv_decimal_separator: ','
138 138
  general_csv_encoding: UTF-8
139 139
  general_pdf_fontname: freesans
140
  general_pdf_monospaced_fontname: freemono
140 141
  general_first_day_of_week: '2'
141 142

  
142 143
  notice_account_updated: Cont actualizat.
config/locales/lv.yml (working copy)
136 136
  general_csv_decimal_separator: '.'
137 137
  general_csv_encoding: UTF-8
138 138
  general_pdf_fontname: freesans
139
  general_pdf_monospaced_fontname: freemono
139 140
  general_first_day_of_week: '1'
140 141

  
141 142
  notice_account_updated: Konts tika atjaunots veiksmīgi.
config/locales/zh.yml (working copy)
146 146
  general_csv_decimal_separator: '.'
147 147
  general_csv_encoding: gb18030
148 148
  general_pdf_fontname: stsongstdlight
149
  general_pdf_monospaced_fontname: stsongstdlight
149 150
  general_first_day_of_week: '7'
150 151

  
151 152
  notice_account_updated: 帐号更新成功
config/locales/ca.yml (working copy)
145 145
  general_csv_decimal_separator: ','
146 146
  general_csv_encoding: ISO-8859-15
147 147
  general_pdf_fontname: freesans
148
  general_pdf_monospaced_fontname: freemono
148 149
  general_first_day_of_week: '1'
149 150

  
150 151
  notice_account_updated: "El compte s'ha actualitzat correctament."
config/locales/pt.yml (working copy)
152 152
  general_csv_decimal_separator: ','
153 153
  general_csv_encoding: ISO-8859-15
154 154
  general_pdf_fontname: freesans
155
  general_pdf_monospaced_fontname: freemono
155 156
  general_first_day_of_week: '1'
156 157

  
157 158
  notice_account_updated: A conta foi atualizada com sucesso.
config/locales/pt-BR.yml (working copy)
162 162
  general_csv_decimal_separator: ','
163 163
  general_csv_encoding: ISO-8859-1
164 164
  general_pdf_fontname: freesans
165
  general_pdf_monospaced_fontname: freemono
165 166
  general_first_day_of_week: '1'
166 167

  
167 168
  notice_account_updated: Conta atualizada com sucesso.
config/locales/tr.yml (working copy)
156 156
  general_csv_separator: ','
157 157
  general_csv_encoding: ISO-8859-9
158 158
  general_pdf_fontname: freesans
159
  general_pdf_monospaced_fontname: freemono
159 160
  general_first_day_of_week: '7'
160 161

  
161 162
  notice_account_updated: Hesap başarıyla güncelleştirildi.
config/locales/ru.yml (working copy)
395 395
  general_csv_encoding: UTF-8
396 396
  general_csv_separator: ';'
397 397
  general_pdf_fontname: freesans
398
  general_pdf_monospaced_fontname: freemono
398 399
  general_first_day_of_week: '1'
399 400
  general_lang_name: 'Russian (Русский)'
400 401
  general_text_no: 'нет'
config/locales/en-GB.yml (working copy)
146 146
  general_csv_decimal_separator: '.'
147 147
  general_csv_encoding: ISO-8859-1
148 148
  general_pdf_fontname: freesans
149
  general_pdf_monospaced_fontname: freemono
149 150
  general_first_day_of_week: '1'
150 151

  
151 152
  notice_account_updated: Account was successfully updated.
config/locales/id.yml (working copy)
142 142
  general_csv_decimal_separator: '.'
143 143
  general_csv_encoding: ISO-8859-1
144 144
  general_pdf_fontname: freesans
145
  general_pdf_monospaced_fontname: freemono
145 146
  general_first_day_of_week: '7'
146 147

  
147 148
  notice_account_updated: Akun sudah berhasil diperbarui.
config/locales/el.yml (working copy)
143 143
  general_csv_decimal_separator: '.'
144 144
  general_csv_encoding: UTF-8
145 145
  general_pdf_fontname: freesans
146
  general_pdf_monospaced_fontname: freemono
146 147
  general_first_day_of_week: '7'
147 148

  
148 149
  notice_account_updated: Ο λογαριασμός ενημερώθηκε επιτυχώς.
config/locales/en.yml (working copy)
142 142
  general_csv_decimal_separator: '.'
143 143
  general_csv_encoding: ISO-8859-1
144 144
  general_pdf_fontname: freesans
145
  general_pdf_monospaced_fontname: freemono
145 146
  general_first_day_of_week: '7'
146 147

  
147 148
  notice_account_updated: Account was successfully updated.
config/locales/gl.yml (working copy)
317 317
  general_csv_encoding: ISO-8859-15
318 318
  general_csv_separator: ';'
319 319
  general_pdf_fontname: freesans
320
  general_pdf_monospaced_fontname: freemono
320 321
  general_first_day_of_week: '1'
321 322
  general_lang_name: 'Galician (Galego)'
322 323
  general_text_No: 'Non'
config/locales/ar.yml (working copy)
141 141
  general_csv_decimal_separator: '.'
142 142
  general_csv_encoding: ISO-8859-1
143 143
  general_pdf_fontname: DejaVuSans
144
  general_pdf_monospaced_fontname: DejaVuSansMono
144 145
  general_first_day_of_week: '7'
145 146

  
146 147
  notice_account_updated: لقد تم تجديد الحساب بنجاح.
config/locales/es-PA.yml (working copy)
343 343
  general_csv_encoding: ISO-8859-15
344 344
  general_csv_separator: ','
345 345
  general_pdf_fontname: freesans
346
  general_pdf_monospaced_fontname: freemono
346 347
  general_first_day_of_week: '1'
347 348
  general_lang_name: 'Spanish/Panama (Español/Panamá)'
348 349
  general_text_No: 'No'
config/locales/cs.yml (working copy)
147 147
  general_csv_decimal_separator: '.'
148 148
  general_csv_encoding: UTF-8
149 149
  general_pdf_fontname: freesans
150
  general_pdf_monospaced_fontname: freemono
150 151
  general_first_day_of_week: '1'
151 152

  
152 153
  notice_account_updated: Účet byl úspěšně změněn.
config/locales/es.yml (working copy)
341 341
  general_csv_encoding: ISO-8859-15
342 342
  general_csv_separator: ';'
343 343
  general_pdf_fontname: freesans
344
  general_pdf_monospaced_fontname: freemono
344 345
  general_first_day_of_week: '1'
345 346
  general_lang_name: 'Spanish (Español)'
346 347
  general_text_No: 'No'
config/locales/mk.yml (working copy)
143 143
  general_csv_decimal_separator: '.'
144 144
  general_csv_encoding: UTF-8
145 145
  general_pdf_fontname: freesans
146
  general_pdf_monospaced_fontname: freemono
146 147
  general_first_day_of_week: '1'
147 148

  
148 149
  notice_account_updated: Профилот е успешно ажуриран.
config/locales/et.yml (working copy)
159 159
  general_csv_decimal_separator: "."
160 160
  general_csv_encoding: ISO-8859-13
161 161
  general_pdf_fontname: freesans
162
  general_pdf_monospaced_fontname: freemono
162 163
  general_first_day_of_week: "1"
163 164

  
164 165
  notice_account_updated: "Konto uuendamine õnnestus."
config/locales/zh-TW.yml (working copy)
226 226
  general_csv_decimal_separator: '.'
227 227
  general_csv_encoding: Big5
228 228
  general_pdf_fontname: msungstdlight
229
  general_pdf_monospaced_fontname: msungstdlight
229 230
  general_first_day_of_week: '7'
230 231

  
231 232
  notice_account_updated: 帳戶更新資訊已儲存
config/locales/eu.yml (working copy)
144 144
  general_csv_decimal_separator: '.'
145 145
  general_csv_encoding: UTF-8
146 146
  general_pdf_fontname: freesans
147
  general_pdf_monospaced_fontname: freemono
147 148
  general_first_day_of_week: '1'
148 149

  
149 150
  notice_account_updated: Kontua ongi eguneratu da.
config/locales/ko.yml (working copy)
189 189
  general_csv_decimal_separator: '.'
190 190
  general_csv_encoding: CP949
191 191
  general_pdf_fontname: hysmyeongjostdmedium
192
  general_pdf_monospaced_fontname: hysmyeongjostdmedium
192 193
  general_first_day_of_week: '7'
193 194

  
194 195
  notice_account_updated: 계정이 성공적으로 변경되었습니다.
config/locales/az.yml (working copy)
385 385
  general_csv_encoding: UTF-8
386 386
  general_csv_separator: ';'
387 387
  general_pdf_fontname: freesans
388
  general_pdf_monospaced_fontname: freemono
388 389
  general_first_day_of_week: '1'
389 390
  general_lang_name: 'Azerbaijanian (Azeri)'
390 391
  general_text_no: 'xeyr'
config/locales/mn.yml (working copy)
142 142
  general_csv_decimal_separator: '.'
143 143
  general_csv_encoding: UTF-8
144 144
  general_pdf_fontname: freesans
145
  general_pdf_monospaced_fontname: freemono
145 146
  general_first_day_of_week: '7'
146 147

  
147 148
  notice_account_updated: Дансыг амжилттай өөрчиллөө.
config/locales/it.yml (working copy)
147 147
  general_csv_decimal_separator: ','
148 148
  general_csv_encoding: ISO-8859-1
149 149
  general_pdf_fontname: freesans
150
  general_pdf_monospaced_fontname: freemono
150 151
  general_first_day_of_week: '1'
151 152

  
152 153
  notice_account_updated: L'utente è stato aggiornato.
config/locales/sk.yml (working copy)
141 141
  general_csv_decimal_separator: '.'
142 142
  general_csv_encoding: UTF-8
143 143
  general_pdf_fontname: freesans
144
  general_pdf_monospaced_fontname: freemono
144 145
  general_first_day_of_week: '1'
145 146

  
146 147
  notice_account_updated: Účet bol úspešne zmenený.
config/locales/sl.yml (working copy)
141 141
  general_csv_decimal_separator: '.'
142 142
  general_csv_encoding: UTF-8
143 143
  general_pdf_fontname: freesans
144
  general_pdf_monospaced_fontname: freemono
144 145
  general_first_day_of_week: '1'
145 146

  
146 147
  notice_account_updated: Račun je bil uspešno posodobljen.
config/locales/uk.yml (working copy)
140 140
  general_csv_decimal_separator: '.'
141 141
  general_csv_encoding: UTF-8
142 142
  general_pdf_fontname: freesans
143
  general_pdf_monospaced_fontname: freemono
143 144
  general_first_day_of_week: '1'
144 145

  
145 146
  notice_account_updated: Обліковий запис успішно оновлений.
config/locales/sq.yml (working copy)
142 142
  general_csv_decimal_separator: '.'
143 143
  general_csv_encoding: ISO-8859-1
144 144
  general_pdf_fontname: freesans
145
  general_pdf_monospaced_fontname: freemono
145 146
  general_first_day_of_week: '7'
146 147

  
147 148
  notice_account_updated: Llogaria u perditesua me sukses.
config/locales/sr.yml (working copy)
143 143
  general_csv_decimal_separator: '.'
144 144
  general_csv_encoding: UTF-8
145 145
  general_pdf_fontname: freesans
146
  general_pdf_monospaced_fontname: freemono
146 147
  general_first_day_of_week: '1'
147 148

  
148 149
  notice_account_updated: Налог је успешно ажуриран.
config/locales/da.yml (working copy)
159 159
  general_csv_separator: ','
160 160
  general_csv_encoding: ISO-8859-1
161 161
  general_pdf_fontname: freesans
162
  general_pdf_monospaced_fontname: freemono
162 163
  general_first_day_of_week: '1'
163 164

  
164 165
  notice_account_updated: Kontoen er opdateret.
config/locales/fa.yml (working copy)
142 142
  general_csv_decimal_separator: '.'
143 143
  general_csv_encoding: UTF-8
144 144
  general_pdf_fontname: DejaVuSans
145
  general_pdf_monospaced_fontname: DejaVuSans
145 146
  general_first_day_of_week: '6'
146 147

  
147 148
  notice_account_updated: حساب شما بروز شد.
config/locales/bg.yml (working copy)
143 143
  general_csv_decimal_separator: '.'
144 144
  general_csv_encoding: UTF-8
145 145
  general_pdf_fontname: freesans
146
  general_pdf_monospaced_fontname: freemono
146 147
  general_first_day_of_week: '1'
147 148

  
148 149
  notice_account_updated: Профилът е обновен успешно.
config/locales/de.yml (working copy)
395 395
  general_csv_encoding: ISO-8859-1
396 396
  general_csv_separator: ';'
397 397
  general_pdf_fontname: freesans
398
  general_pdf_monospaced_fontname: freemono
398 399
  general_first_day_of_week: '1'
399 400
  general_lang_name: 'German (Deutsch)'
400 401
  general_text_No: 'Nein'
config/locales/sv.yml (working copy)
184 184
  general_csv_decimal_separator: '.'
185 185
  general_csv_encoding: ISO-8859-1
186 186
  general_pdf_fontname: freesans
187
  general_pdf_monospaced_fontname: freemono
187 188
  general_first_day_of_week: '1'
188 189

  
189 190
  notice_account_updated: Kontot har uppdaterats
config/locales/ja.yml (working copy)
163 163
  general_csv_decimal_separator: '.'
164 164
  general_csv_encoding: CP932
165 165
  general_pdf_fontname: kozminproregular
166
  general_pdf_monospaced_fontname: kozminproregular
166 167
  general_first_day_of_week: '7'
167 168

  
168 169
  notice_account_updated: アカウントが更新されました。
config/locales/he.yml (working copy)
147 147
  general_csv_decimal_separator: '.'
148 148
  general_csv_encoding: ISO-8859-8
149 149
  general_pdf_fontname: freesans
150
  general_pdf_monospaced_fontname: freemono
150 151
  general_first_day_of_week: '7'
151 152

  
152 153
  notice_account_updated: החשבון עודכן בהצלחה!
config/locales/fi.yml (working copy)
167 167
  general_csv_decimal_separator: '.'
168 168
  general_csv_encoding: ISO-8859-15
169 169
  general_pdf_fontname: freesans
170
  general_pdf_monospaced_fontname: freemono
170 171
  general_first_day_of_week: '1'
171 172

  
172 173
  notice_account_updated: Tilin päivitys onnistui.
config/locales/bs.yml (working copy)
153 153
  general_csv_decimal_separator: '.'
154 154
  general_csv_encoding: UTF-8
155 155
  general_pdf_fontname: freesans
156
  general_pdf_monospaced_fontname: freemono
156 157
  general_first_day_of_week: '7'
157 158

  
158 159
  notice_account_activated: Vaš nalog je aktiviran. Možete se prijaviti.
config/locales/fr.yml (working copy)
162 162
  general_csv_decimal_separator: ','
163 163
  general_csv_encoding: ISO-8859-1
164 164
  general_pdf_fontname: freesans
165
  general_pdf_monospaced_fontname: freemono
165 166
  general_first_day_of_week: '1'
166 167

  
167 168
  notice_account_updated: Le compte a été mis à jour avec succès.
config/locales/nl.yml (working copy)
286 286
  general_csv_encoding: ISO-8859-1
287 287
  general_csv_separator: ';'
288 288
  general_pdf_fontname: freesans
289
  general_pdf_monospaced_fontname: freemono
289 290
  general_first_day_of_week: '7'
290 291
  general_lang_name: 'Dutch (Nederlands)'
291 292
  general_text_No: 'Nee'
config/locales/hr.yml (working copy)
137 137
  general_csv_decimal_separator: ','
138 138
  general_csv_encoding: UTF-8
139 139
  general_pdf_fontname: freesans
140
  general_pdf_monospaced_fontname: freemono
140 141
  general_first_day_of_week: '7'
141 142

  
142 143
  notice_account_updated: Vaš profil je uspješno promijenjen.
config/locales/pl.yml (working copy)
309 309
  general_csv_encoding: UTF-8
310 310
  general_csv_separator: ';'
311 311
  general_pdf_fontname: freesans
312
  general_pdf_monospaced_fontname: freemono
312 313
  general_first_day_of_week: '1'
313 314
  general_lang_name: 'Polish (Polski)'
314 315
  general_text_No: 'Nie'
config/locales/th.yml (working copy)
140 140
  general_csv_decimal_separator: '.'
141 141
  general_csv_encoding: Windows-874
142 142
  general_pdf_fontname: freeserif
143
  general_pdf_monospaced_fontname: freeserif
143 144
  general_first_day_of_week: '1'
144 145

  
145 146
  notice_account_updated: บัญชีได้ถูกปรับปรุงแล้ว.
config/locales/no.yml (working copy)
132 132
  general_csv_decimal_separator: '.'
133 133
  general_csv_encoding: ISO-8859-1
134 134
  general_pdf_fontname: freesans
135
  general_pdf_monospaced_fontname: freemono
135 136
  general_first_day_of_week: '1'
136 137

  
137 138
  notice_account_updated: Kontoen er oppdatert.
config/locales/hu.yml (working copy)
163 163
  general_csv_decimal_separator: '.'
164 164
  general_csv_encoding: ISO-8859-2
165 165
  general_pdf_fontname: freesans
166
  general_pdf_monospaced_fontname: freemono
166 167
  general_first_day_of_week: '1'
167 168

  
168 169
  notice_account_updated: A fiók adatai sikeresen frissítve.
config/locales/vi.yml (working copy)
195 195
  general_csv_decimal_separator: '.'
196 196
  general_csv_encoding: UTF-8
197 197
  general_pdf_fontname: DejaVuSans
198
  general_pdf_monospaced_fontname: DejaVuSans
198 199
  general_first_day_of_week: '1'
199 200

  
200 201
  notice_account_updated: Cập nhật tài khoản thành công.
lib/redmine/export/pdf.rb (working copy)
35 35
          set_rtl(l(:direction) == 'rtl')
36 36

  
37 37
          @font_for_content = l(:general_pdf_fontname)
38
          @monospaced_font_for_content = l(:general_pdf_monospaced_fontname)
38 39
          @font_for_footer  = l(:general_pdf_fontname)
39 40
          set_creator(Redmine::Info.app_name)
40 41
          set_font(@font_for_content)
41 42

  
42 43
          set_header_font([@font_for_content, '', 10])
43 44
          set_footer_font([@font_for_content, '', 8])
44
          set_default_monospaced_font(@font_for_content)
45
          set_default_monospaced_font(@monospaced_font_for_content)
45 46
          set_display_mode('default', 'OneColumn')
46 47
        end
47 48

  
......
51 52

  
52 53
        def SetFont(family, style='', size=0, fontfile='')
53 54
          # FreeSerif Bold Thai font has problem.
54
          style.delete!('B') if l(:general_pdf_fontname) == 'freeserif'
55
          style.delete!('B') if family == 'freeserif'
55 56
          # DejaVuSans Italic Arabic and Persian font has problem.
56
          style.delete!('I') if l(:general_pdf_fontname) == 'DejaVuSans'
57
          style.delete!('I') if family == 'DejaVuSans'
58
          # DejaVuSansMono Italic Arabic font has problem.
59
          style.delete!('I') if family == 'DejaVuSansMono'
57 60
          super(family, style, size, fontfile)
58 61
        end
59 62
        alias_method :set_font, :SetFont
Gemfile (working copy)
17 17

  
18 18
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
19 19
gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin, :jruby]
20
gem "rbpdf", "~> 1.18.7"
20
gem "rbpdf", "~> 1.19.0"
21 21

  
22 22
# Optional gem for LDAP authentication
23 23
group :ldap do
(4-4/8)