numbers_and_words 0.10.0 → 0.11.12

Sign up to get free protection for your applications and to get access to all the features.
Files changed (202) hide show
  1. checksums.yaml +6 -14
  2. data/CHANGELOG.md +264 -0
  3. data/README.rdoc +154 -19
  4. data/lib/numbers_and_words/core_ext/array.rb +4 -2
  5. data/lib/numbers_and_words/core_ext/float.rb +3 -1
  6. data/lib/numbers_and_words/core_ext/integer.rb +3 -1
  7. data/lib/numbers_and_words/core_ext.rb +2 -0
  8. data/lib/numbers_and_words/helper_classes/array_extensions/helpers.rb +26 -16
  9. data/lib/numbers_and_words/helper_classes/figures_array.rb +9 -6
  10. data/lib/numbers_and_words/helper_classes/words_array.rb +6 -6
  11. data/lib/numbers_and_words/helper_classes.rb +3 -1
  12. data/lib/numbers_and_words/i18n/initialization.rb +4 -2
  13. data/lib/numbers_and_words/i18n/locales/numbers.cs.yml +95 -0
  14. data/lib/numbers_and_words/i18n/locales/numbers.de.yml +5 -4
  15. data/lib/numbers_and_words/i18n/locales/numbers.en-GB.yml +24 -8
  16. data/lib/numbers_and_words/i18n/locales/numbers.en.yml +24 -8
  17. data/lib/numbers_and_words/i18n/locales/numbers.es.yml +102 -13
  18. data/lib/numbers_and_words/i18n/locales/numbers.et.yml +4 -4
  19. data/lib/numbers_and_words/i18n/locales/numbers.fr.yml +73 -15
  20. data/lib/numbers_and_words/i18n/locales/numbers.hu.yml +11 -8
  21. data/lib/numbers_and_words/i18n/locales/numbers.hy.yml +7 -0
  22. data/lib/numbers_and_words/i18n/locales/numbers.it.yml +3 -3
  23. data/lib/numbers_and_words/i18n/locales/numbers.ka.yml +15 -0
  24. data/lib/numbers_and_words/i18n/locales/numbers.kz.yml +7 -0
  25. data/lib/numbers_and_words/i18n/locales/numbers.lt.yml +14 -15
  26. data/lib/numbers_and_words/i18n/locales/numbers.lv.yml +5 -6
  27. data/lib/numbers_and_words/i18n/locales/numbers.nl.yml +7 -4
  28. data/lib/numbers_and_words/i18n/locales/numbers.pt-BR.yml +121 -0
  29. data/lib/numbers_and_words/i18n/locales/numbers.pt.yml +25 -0
  30. data/lib/numbers_and_words/i18n/locales/numbers.ru.yml +39 -27
  31. data/lib/numbers_and_words/i18n/locales/numbers.se.yml +3 -3
  32. data/lib/numbers_and_words/i18n/locales/numbers.tr.yml +3 -3
  33. data/lib/numbers_and_words/i18n/locales/numbers.ua.yml +39 -15
  34. data/lib/numbers_and_words/i18n/locales/numbers.vi.yml +13 -0
  35. data/lib/numbers_and_words/i18n/pluralization.rb +6 -5
  36. data/lib/numbers_and_words/i18n/plurals/cs.rb +38 -0
  37. data/lib/numbers_and_words/i18n/plurals/lt.rb +17 -11
  38. data/lib/numbers_and_words/i18n/plurals/lv.rb +6 -4
  39. data/lib/numbers_and_words/i18n/plurals/plurals.rb +11 -7
  40. data/lib/numbers_and_words/i18n/plurals/ru.rb +23 -13
  41. data/lib/numbers_and_words/i18n/plurals/ua.rb +2 -0
  42. data/lib/numbers_and_words/i18n.rb +7 -5
  43. data/lib/numbers_and_words/strategies/array_joiner/languages/base.rb +3 -1
  44. data/lib/numbers_and_words/strategies/array_joiner/languages/cs.rb +12 -0
  45. data/lib/numbers_and_words/strategies/array_joiner/languages/{en_gb.rb → en-GB.rb} +3 -1
  46. data/lib/numbers_and_words/strategies/array_joiner/languages/en.rb +2 -0
  47. data/lib/numbers_and_words/strategies/array_joiner/languages/es.rb +12 -0
  48. data/lib/numbers_and_words/strategies/array_joiner/languages/families/base.rb +7 -6
  49. data/lib/numbers_and_words/strategies/array_joiner/languages/fr.rb +12 -0
  50. data/lib/numbers_and_words/strategies/array_joiner/languages/hu.rb +2 -0
  51. data/lib/numbers_and_words/strategies/array_joiner/languages/pt-BR.rb +12 -0
  52. data/lib/numbers_and_words/strategies/array_joiner/languages/ru.rb +2 -0
  53. data/lib/numbers_and_words/strategies/array_joiner/languages/ua.rb +2 -0
  54. data/lib/numbers_and_words/strategies/array_joiner/languages/vi.rb +12 -0
  55. data/lib/numbers_and_words/strategies/array_joiner/languages.rb +11 -4
  56. data/lib/numbers_and_words/strategies/array_joiner.rb +3 -2
  57. data/lib/numbers_and_words/strategies/figures_converter/decorators/base.rb +4 -2
  58. data/lib/numbers_and_words/strategies/figures_converter/decorators/cs/base.rb +14 -0
  59. data/lib/numbers_and_words/strategies/figures_converter/decorators/cs/fractional.rb +40 -0
  60. data/lib/numbers_and_words/strategies/figures_converter/decorators/cs/integral.rb +31 -0
  61. data/lib/numbers_and_words/strategies/figures_converter/decorators/{en_gb.rb → cs.rb} +5 -3
  62. data/lib/numbers_and_words/strategies/figures_converter/decorators/en/base.rb +3 -1
  63. data/lib/numbers_and_words/strategies/figures_converter/decorators/en/fractional.rb +4 -3
  64. data/lib/numbers_and_words/strategies/figures_converter/decorators/en/integral.rb +3 -1
  65. data/lib/numbers_and_words/strategies/figures_converter/decorators/{en_gb → en-GB}/base.rb +2 -0
  66. data/lib/numbers_and_words/strategies/figures_converter/decorators/{en_gb → en-GB}/fractional.rb +2 -0
  67. data/lib/numbers_and_words/strategies/figures_converter/decorators/{en_gb → en-GB}/integral.rb +2 -0
  68. data/lib/numbers_and_words/strategies/figures_converter/decorators/en-GB.rb +5 -0
  69. data/lib/numbers_and_words/strategies/figures_converter/decorators/en.rb +2 -0
  70. data/lib/numbers_and_words/strategies/figures_converter/decorators/es/base.rb +14 -0
  71. data/lib/numbers_and_words/strategies/figures_converter/decorators/es/fractional.rb +40 -0
  72. data/lib/numbers_and_words/strategies/figures_converter/decorators/es/integral.rb +14 -0
  73. data/lib/numbers_and_words/strategies/figures_converter/decorators/es.rb +5 -0
  74. data/lib/numbers_and_words/strategies/figures_converter/decorators/fr/base.rb +14 -0
  75. data/lib/numbers_and_words/strategies/figures_converter/decorators/fr/fractional.rb +39 -0
  76. data/lib/numbers_and_words/strategies/figures_converter/decorators/fr/integral.rb +14 -0
  77. data/lib/numbers_and_words/strategies/figures_converter/decorators/fr.rb +5 -0
  78. data/lib/numbers_and_words/strategies/figures_converter/decorators/hu/base.rb +3 -1
  79. data/lib/numbers_and_words/strategies/figures_converter/decorators/hu/fractional.rb +5 -4
  80. data/lib/numbers_and_words/strategies/figures_converter/decorators/hu/integral.rb +3 -1
  81. data/lib/numbers_and_words/strategies/figures_converter/decorators/hu.rb +3 -1
  82. data/lib/numbers_and_words/strategies/figures_converter/decorators/pt-BR/base.rb +14 -0
  83. data/lib/numbers_and_words/strategies/figures_converter/decorators/pt-BR/fractional.rb +39 -0
  84. data/lib/numbers_and_words/strategies/figures_converter/decorators/pt-BR/integral.rb +31 -0
  85. data/lib/numbers_and_words/strategies/figures_converter/decorators/pt-BR.rb +5 -0
  86. data/lib/numbers_and_words/strategies/figures_converter/decorators/ru/base.rb +3 -1
  87. data/lib/numbers_and_words/strategies/figures_converter/decorators/ru/fractional.rb +4 -3
  88. data/lib/numbers_and_words/strategies/figures_converter/decorators/ru/integral.rb +3 -2
  89. data/lib/numbers_and_words/strategies/figures_converter/decorators/ru.rb +2 -0
  90. data/lib/numbers_and_words/strategies/figures_converter/decorators/ua/base.rb +3 -1
  91. data/lib/numbers_and_words/strategies/figures_converter/decorators/ua/fractional.rb +4 -3
  92. data/lib/numbers_and_words/strategies/figures_converter/decorators/ua/integral.rb +3 -2
  93. data/lib/numbers_and_words/strategies/figures_converter/decorators/ua.rb +2 -0
  94. data/lib/numbers_and_words/strategies/figures_converter/decorators/vi/base.rb +14 -0
  95. data/lib/numbers_and_words/strategies/figures_converter/decorators/vi/fractional.rb +14 -0
  96. data/lib/numbers_and_words/strategies/figures_converter/decorators/vi/integral.rb +14 -0
  97. data/lib/numbers_and_words/strategies/figures_converter/decorators/vi.rb +5 -0
  98. data/lib/numbers_and_words/strategies/figures_converter/decorators.rb +17 -10
  99. data/lib/numbers_and_words/strategies/figures_converter/languages/base.rb +6 -4
  100. data/lib/numbers_and_words/strategies/figures_converter/languages/cs.rb +53 -0
  101. data/lib/numbers_and_words/strategies/figures_converter/languages/de.rb +15 -15
  102. data/lib/numbers_and_words/strategies/figures_converter/languages/{en_gb.rb → en-GB.rb} +3 -1
  103. data/lib/numbers_and_words/strategies/figures_converter/languages/en.rb +20 -12
  104. data/lib/numbers_and_words/strategies/figures_converter/languages/es.rb +58 -17
  105. data/lib/numbers_and_words/strategies/figures_converter/languages/et.rb +3 -4
  106. data/lib/numbers_and_words/strategies/figures_converter/languages/families/base.rb +7 -5
  107. data/lib/numbers_and_words/strategies/figures_converter/languages/families/cyrillic.rb +8 -6
  108. data/lib/numbers_and_words/strategies/figures_converter/languages/families/helpers.rb +12 -14
  109. data/lib/numbers_and_words/strategies/figures_converter/languages/fr.rb +14 -14
  110. data/lib/numbers_and_words/strategies/figures_converter/languages/hu.rb +11 -11
  111. data/lib/numbers_and_words/strategies/figures_converter/languages/{families/latin.rb → hy.rb} +3 -4
  112. data/lib/numbers_and_words/strategies/figures_converter/languages/it.rb +2 -1
  113. data/lib/numbers_and_words/strategies/figures_converter/languages/ka.rb +39 -0
  114. data/lib/numbers_and_words/strategies/figures_converter/languages/kz.rb +12 -0
  115. data/lib/numbers_and_words/strategies/figures_converter/languages/lt.rb +10 -14
  116. data/lib/numbers_and_words/strategies/figures_converter/languages/lv.rb +5 -23
  117. data/lib/numbers_and_words/strategies/figures_converter/languages/nl.rb +31 -7
  118. data/lib/numbers_and_words/strategies/figures_converter/languages/pt-BR.rb +118 -0
  119. data/lib/numbers_and_words/strategies/figures_converter/languages/pt.rb +29 -0
  120. data/lib/numbers_and_words/strategies/figures_converter/languages/ru.rb +2 -0
  121. data/lib/numbers_and_words/strategies/figures_converter/languages/se.rb +2 -1
  122. data/lib/numbers_and_words/strategies/figures_converter/languages/tr.rb +19 -1
  123. data/lib/numbers_and_words/strategies/figures_converter/languages/ua.rb +2 -0
  124. data/lib/numbers_and_words/strategies/figures_converter/languages/vi.rb +100 -0
  125. data/lib/numbers_and_words/strategies/figures_converter/languages.rb +18 -14
  126. data/lib/numbers_and_words/strategies/figures_converter/options/base/gender.rb +30 -0
  127. data/lib/numbers_and_words/strategies/figures_converter/options/base/ordinal.rb +28 -0
  128. data/lib/numbers_and_words/strategies/figures_converter/options/base/remove_zero.rb +30 -0
  129. data/lib/numbers_and_words/strategies/figures_converter/options/{en_gb.rb → base.rb} +5 -4
  130. data/lib/numbers_and_words/strategies/figures_converter/options/cs/gender.rb +17 -0
  131. data/lib/numbers_and_words/strategies/figures_converter/options/cs/ordinal.rb +14 -0
  132. data/lib/numbers_and_words/strategies/figures_converter/options/cs/remove_zero.rb +14 -0
  133. data/lib/numbers_and_words/strategies/figures_converter/options/cs.rb +5 -0
  134. data/lib/numbers_and_words/strategies/figures_converter/options/en/hundreds_with_union.rb +5 -3
  135. data/lib/numbers_and_words/strategies/figures_converter/options/en/ordinal.rb +8 -14
  136. data/lib/numbers_and_words/strategies/figures_converter/options/en/pronounced.rb +60 -0
  137. data/lib/numbers_and_words/strategies/figures_converter/options/en/remove_hyphen.rb +4 -3
  138. data/lib/numbers_and_words/strategies/figures_converter/options/en/remove_zero.rb +4 -19
  139. data/lib/numbers_and_words/strategies/figures_converter/options/{en_gb → en-GB}/hundreds_with_union.rb +3 -1
  140. data/lib/numbers_and_words/strategies/figures_converter/options/{en_gb → en-GB}/ordinal.rb +3 -1
  141. data/lib/numbers_and_words/strategies/figures_converter/options/en-GB/pronounced.rb +14 -0
  142. data/lib/numbers_and_words/strategies/figures_converter/options/{en_gb → en-GB}/remove_hyphen.rb +3 -1
  143. data/lib/numbers_and_words/strategies/figures_converter/options/{en_gb → en-GB}/remove_zero.rb +3 -1
  144. data/lib/numbers_and_words/strategies/figures_converter/options/en-GB.rb +7 -0
  145. data/lib/numbers_and_words/strategies/figures_converter/options/en.rb +4 -1
  146. data/lib/numbers_and_words/strategies/figures_converter/options/es/apocopated.rb +30 -0
  147. data/lib/numbers_and_words/strategies/figures_converter/options/es/gender.rb +14 -0
  148. data/lib/numbers_and_words/strategies/figures_converter/options/es/remove_zero.rb +14 -0
  149. data/lib/numbers_and_words/strategies/figures_converter/options/es.rb +5 -0
  150. data/lib/numbers_and_words/strategies/figures_converter/options/hu/ordinal.rb +4 -50
  151. data/lib/numbers_and_words/strategies/figures_converter/options/hu.rb +2 -0
  152. data/lib/numbers_and_words/strategies/figures_converter/options/nl/tens_of_hundreds.rb +30 -0
  153. data/lib/numbers_and_words/strategies/figures_converter/options/nl.rb +3 -0
  154. data/lib/numbers_and_words/strategies/figures_converter/options/pt-BR/gender.rb +14 -0
  155. data/lib/numbers_and_words/strategies/figures_converter/options/pt-BR/ordinal.rb +14 -0
  156. data/lib/numbers_and_words/strategies/figures_converter/options/pt-BR/remove_zero.rb +14 -0
  157. data/lib/numbers_and_words/strategies/figures_converter/options/pt-BR.rb +5 -0
  158. data/lib/numbers_and_words/strategies/figures_converter/options/ru/gender.rb +4 -18
  159. data/lib/numbers_and_words/strategies/figures_converter/options/ru.rb +2 -0
  160. data/lib/numbers_and_words/strategies/figures_converter/options/ua/gender.rb +4 -18
  161. data/lib/numbers_and_words/strategies/figures_converter/options/ua.rb +2 -0
  162. data/lib/numbers_and_words/strategies/figures_converter/options.rb +26 -9
  163. data/lib/numbers_and_words/strategies/figures_converter.rb +5 -4
  164. data/lib/numbers_and_words/strategies.rb +3 -1
  165. data/lib/numbers_and_words/translations/base.rb +4 -2
  166. data/lib/numbers_and_words/translations/cs.rb +48 -0
  167. data/lib/numbers_and_words/translations/de.rb +10 -8
  168. data/lib/numbers_and_words/translations/en-GB.rb +10 -0
  169. data/lib/numbers_and_words/translations/en.rb +2 -0
  170. data/lib/numbers_and_words/translations/es.rb +21 -20
  171. data/lib/numbers_and_words/translations/et.rb +4 -11
  172. data/lib/numbers_and_words/translations/extensions/fraction_significance.rb +9 -8
  173. data/lib/numbers_and_words/translations/families/base.rb +13 -11
  174. data/lib/numbers_and_words/translations/families/cyrillic.rb +9 -11
  175. data/lib/numbers_and_words/translations/families/latin.rb +7 -7
  176. data/lib/numbers_and_words/translations/fr.rb +19 -14
  177. data/lib/numbers_and_words/translations/hu.rb +6 -13
  178. data/lib/numbers_and_words/translations/hy.rb +21 -0
  179. data/lib/numbers_and_words/translations/it.rb +5 -3
  180. data/lib/numbers_and_words/translations/ka.rb +64 -0
  181. data/lib/numbers_and_words/translations/kz.rb +9 -0
  182. data/lib/numbers_and_words/translations/lt.rb +4 -12
  183. data/lib/numbers_and_words/translations/lv.rb +4 -12
  184. data/lib/numbers_and_words/translations/nl.rb +16 -4
  185. data/lib/numbers_and_words/translations/pt-BR.rb +77 -0
  186. data/lib/numbers_and_words/translations/pt.rb +20 -0
  187. data/lib/numbers_and_words/translations/ru.rb +2 -17
  188. data/lib/numbers_and_words/translations/se.rb +4 -2
  189. data/lib/numbers_and_words/translations/tr.rb +8 -2
  190. data/lib/numbers_and_words/translations/ua.rb +2 -13
  191. data/lib/numbers_and_words/translations/vi.rb +24 -0
  192. data/lib/numbers_and_words/translations.rb +11 -2
  193. data/lib/numbers_and_words/version.rb +3 -1
  194. data/lib/numbers_and_words/wrappers/float.rb +22 -16
  195. data/lib/numbers_and_words/wrappers/integer.rb +6 -4
  196. data/lib/numbers_and_words/wrappers.rb +3 -1
  197. data/lib/numbers_and_words.rb +2 -3
  198. metadata +108 -58
  199. data/lib/numbers_and_words/helper_classes/array_extensions/validations.rb +0 -19
  200. data/lib/numbers_and_words/i18n/plurals/es.rb +0 -11
  201. data/lib/numbers_and_words/i18n/plurals/fr.rb +0 -15
  202. data/lib/numbers_and_words/translations/en_gb.rb +0 -6
@@ -1,26 +1,28 @@
1
+ # frozen_string_literal: true
2
+
1
3
  module NumbersAndWords
2
4
  module Translations
3
5
  module Families
4
6
  module Base
5
-
6
- def teens numbers, options = {}
7
+ def teens(numbers, options = {})
7
8
  t("#{options[:prefix]}.teens")[numbers[0]]
8
9
  end
9
10
 
10
- def tens number, options = {}
11
+ def tens(number, options = {})
11
12
  t("#{options[:prefix]}.tens")[number]
12
13
  end
13
14
 
14
- def tens_with_ones numbers, options = {}
15
- [tens(numbers[1]), ones(numbers[0], options)].join options[:separator]
15
+ def tens_with_ones(numbers, options = {})
16
+ [tens(numbers[1]), ones(numbers[0], options)].join options[:separator] || ' '
16
17
  end
17
18
 
18
- def megs capacity, options = {}
19
- number, mega_name = options[:number], "#{options[:prefix]}.mega"
20
- number ? t(mega(capacity), :count => number) : t(mega_name)[capacity]
19
+ def megs(capacity, options = {})
20
+ number = options[:number]
21
+ mega_name = "#{options[:prefix]}.mega"
22
+ number ? t(mega(capacity), count: number) : t(mega_name)[capacity]
21
23
  end
22
24
 
23
- def mega capacity
25
+ def mega(capacity)
24
26
  t(:mega)[capacity]
25
27
  end
26
28
 
@@ -28,8 +30,8 @@ module NumbersAndWords
28
30
  t :union
29
31
  end
30
32
 
31
- def union_separator
32
- t :union_separator
33
+ def micro_separator
34
+ t :micro_separator
33
35
  end
34
36
  end
35
37
  end
@@ -1,27 +1,25 @@
1
+ # frozen_string_literal: true
2
+
1
3
  module NumbersAndWords
2
4
  module Translations
3
5
  module Families
4
6
  module Cyrillic
5
7
  include NumbersAndWords::Translations::Families::Base
6
8
 
7
- def ones number, options = {}
8
- t(:ones)[options[:gender]][number]
9
+ def zero(_options = {})
10
+ t(:ones).values.first[0]
9
11
  end
10
12
 
11
- def tens_with_ones numbers, options = {}
12
- [tens(numbers[1]), ones(numbers[0], options)].join ' '
13
+ def ones(number, options = {})
14
+ t(:ones)[options[:gender]][number]
13
15
  end
14
16
 
15
- def hundreds number, options = {}
17
+ def hundreds(number, _options = {})
16
18
  t(:hundreds)[number]
17
19
  end
18
20
 
19
- def zero options = {}
20
- t(:ones).values.first[0]
21
- end
22
-
23
- def integral number, options = {}
24
- t(:integral, :count => number)
21
+ def integral(number, _options = {})
22
+ t(:integral, count: number)
25
23
  end
26
24
  end
27
25
  end
@@ -1,22 +1,22 @@
1
+ # frozen_string_literal: true
2
+
1
3
  module NumbersAndWords
2
4
  module Translations
3
5
  module Families
4
6
  module Latin
5
7
  include NumbersAndWords::Translations::Families::Base
6
8
 
7
- #private
9
+ def zero(options = {})
10
+ t([options[:prefix], :ones].join('.'))[0]
11
+ end
8
12
 
9
- def ones number, options = {}
13
+ def ones(number, options = {})
10
14
  t([options[:prefix], :ones].join('.'))[number]
11
15
  end
12
16
 
13
- def hundreds number, options = {}
17
+ def hundreds(number, options = {})
14
18
  [t(:ones)[number], t([options[:prefix], :hundreds].join('.'))].join options[:separator] || ' '
15
19
  end
16
-
17
- def zero options = {}
18
- t([options[:prefix], :ones].join('.'))[0]
19
- end
20
20
  end
21
21
  end
22
22
  end
@@ -1,28 +1,33 @@
1
+ # frozen_string_literal: true
2
+
1
3
  module NumbersAndWords
2
4
  module Translations
3
5
  class Fr < Base
4
6
  include NumbersAndWords::Translations::Families::Latin
7
+ include NumbersAndWords::Translations::Extensions::FractionSignificance
5
8
 
6
9
  SPECIAL_TENS_CASE = 8
7
10
 
8
- def tens number, options = {}
9
- options[:alone] = true if options[:alone].nil?
10
- (SPECIAL_TENS_CASE == number and options[:alone]) ? t(:eighty) : super(number)
11
+ def tens(number, options = {})
12
+ return t(:eighty) if number == SPECIAL_TENS_CASE && options[:alone].nil?
13
+
14
+ super number, options
11
15
  end
12
16
 
13
- def tens_with_ones numbers, options = {}
14
- if [7, 9].include? numbers[1]
15
- [tens(numbers[1] - 1, :alone => false), teens(numbers)].join '-'
16
- else
17
- union = numbers[0] == 1 ? ' et ' : '-'
18
- [tens(numbers[1], :alone => false), ones(numbers[0])].join union
19
- end
17
+ def tens_with_ones(numbers, options = {})
18
+ return [tens(numbers[1] - 1, alone: false), teens(numbers)].join('-') if [7, 9].include? numbers[1]
19
+
20
+ separator = numbers[0] == 1 ? " #{union} " : '-'
21
+ super numbers, options.merge(separator: separator)
20
22
  end
21
23
 
22
- def hundreds number, options = {}
23
- options[:pluralize] = false if options[:pluralize].nil?
24
- hundreds = t(:hundreds, :count => options[:pluralize] ? number : 1)
25
- (number == 1) ? hundreds : [t(:ones)[number], hundreds].join(' ')
24
+ def hundreds(number, options = {})
25
+ count = options[:pluralize] ? number : 1
26
+ hundreds = t(:hundreds, count: count)
27
+
28
+ return hundreds if number == 1
29
+
30
+ [t(:ones)[number], hundreds].join(' ')
26
31
  end
27
32
  end
28
33
  end
@@ -1,25 +1,18 @@
1
+ # frozen_string_literal: true
2
+
1
3
  module NumbersAndWords
2
4
  module Translations
3
5
  class Hu < Base
4
6
  include NumbersAndWords::Translations::Families::Latin
5
7
  include NumbersAndWords::Translations::Extensions::FractionSignificance
6
8
 
7
- def tens_with_ones numbers, options = {}
9
+ def tens_with_ones(numbers, options = {})
8
10
  ones, tens = numbers
9
- [t(:tens_with_ones)[tens], t([options[:prefix], :ones_with_tens].join('.'))[ones]].join ''
10
- end
11
-
12
- def hundreds number, options = {}
13
- options[:separator] = ''
14
- super number, options
15
- end
16
-
17
- def micros capacity, number = nil, separator = ''
18
- super capacity, nil, separator
11
+ [t(:tens_with_ones)[tens], t([options[:prefix], :ones_with_tens].join('.'))[ones]].join
19
12
  end
20
13
 
21
- def union
22
- t :union
14
+ def hundreds(number, options = {})
15
+ super number, options.merge(separator: '')
23
16
  end
24
17
  end
25
18
  end
@@ -0,0 +1,21 @@
1
+ # frozen_string_literal: true
2
+
3
+ module NumbersAndWords
4
+ module Translations
5
+ class Hy < Base
6
+ include NumbersAndWords::Translations::Families::Latin
7
+
8
+ def tens_with_ones(numbers, options = {})
9
+ options[:separator] ||= ''
10
+ super
11
+ end
12
+
13
+ def hundreds(number, _options = {})
14
+ parts = [t(:hundreds)]
15
+ parts.unshift(t(:ones)[number]) if number > 1
16
+
17
+ parts.join(' ')
18
+ end
19
+ end
20
+ end
21
+ end
@@ -1,13 +1,15 @@
1
+ # frozen_string_literal: true
2
+
1
3
  module NumbersAndWords
2
4
  module Translations
3
5
  class It < Base
4
6
  include NumbersAndWords::Translations::Families::Latin
5
7
 
6
- def tens_with_ones numbers, options = {}
7
- super numbers, :separator => ''
8
+ def tens_with_ones(numbers, _options = {})
9
+ super numbers, separator: ''
8
10
  end
9
11
 
10
- def hundreds number, options = {}
12
+ def hundreds(number, _options = {})
11
13
  [[number], t(:hundreds)].join ' '
12
14
  end
13
15
  end
@@ -0,0 +1,64 @@
1
+ # frozen_string_literal: true
2
+
3
+ module NumbersAndWords
4
+ module Translations
5
+ class Ka < Base
6
+ include NumbersAndWords::Translations::Families::Latin
7
+ TENS_VIGESIMAL_RANGES = [
8
+ {
9
+ range: Range.new(0, 4, true),
10
+ name: :twenty,
11
+ multiplicative: 2
12
+ },
13
+ {
14
+ range: Range.new(0, 6, true),
15
+ name: :forty,
16
+ multiplicative: 4
17
+ },
18
+ {
19
+ range: Range.new(0, 8, true),
20
+ name: :sixty,
21
+ multiplicative: 6
22
+ },
23
+ {
24
+ range: Range.new(0, 9, false),
25
+ name: :eighty,
26
+ multiplicative: 8
27
+ }
28
+ ].freeze
29
+
30
+ def vigesimal_range(number)
31
+ range = nil
32
+ TENS_VIGESIMAL_RANGES.each do |item|
33
+ if item[:range].include? number
34
+ range = item
35
+ break
36
+ end
37
+ end
38
+
39
+ range
40
+ end
41
+
42
+ def tens_with_ones(numbers, _options = {})
43
+ range = vigesimal_range(numbers[1])
44
+
45
+ minor = if (numbers[1] - range[:multiplicative]).positive?
46
+ teens(numbers)
47
+ else
48
+ ones(numbers[0])
49
+ end
50
+
51
+ [t([:partials, range[:name]].join('.')), minor].join
52
+ end
53
+
54
+ def hundreds(number, options = {})
55
+ options[:prefix] ||= options[:only_hundreds] == true ? nil : :partials
56
+
57
+ parts = [t([options[:prefix], :hundreds].join('.'))]
58
+ parts.unshift(ones(number, prefix: :partials)) if number > 1
59
+
60
+ parts.join
61
+ end
62
+ end
63
+ end
64
+ end
@@ -0,0 +1,9 @@
1
+ # frozen_string_literal: true
2
+
3
+ module NumbersAndWords
4
+ module Translations
5
+ class Kz < Base
6
+ include NumbersAndWords::Translations::Families::Latin
7
+ end
8
+ end
9
+ end
@@ -1,20 +1,12 @@
1
+ # frozen_string_literal: true
2
+
1
3
  module NumbersAndWords
2
4
  module Translations
3
5
  class Lt < Base
4
6
  include NumbersAndWords::Translations::Families::Latin
5
7
 
6
- def tens number, options = {}
7
- super(number)
8
- end
9
-
10
- def tens_with_ones numbers, options = {}
11
- [tens(numbers[1], :alone => false), ones(numbers[0])].join ' '
12
- end
13
-
14
-
15
- def hundreds number, options = {}
16
- options[:is_hundred] = false if options[:is_hundred].nil?
17
- options[:is_hundred] ? t(:one_hundred) : t(:hundreds)[number - 1]
8
+ def hundreds(number, _options = {})
9
+ t(:hundreds)[number]
18
10
  end
19
11
  end
20
12
  end
@@ -1,20 +1,12 @@
1
+ # frozen_string_literal: true
2
+
1
3
  module NumbersAndWords
2
4
  module Translations
3
5
  class Lv < Base
4
6
  include NumbersAndWords::Translations::Families::Latin
5
7
 
6
- def tens number, options = {}
7
- super(number)
8
- end
9
-
10
- def tens_with_ones numbers, options = {}
11
- [tens(numbers[1], :alone => false), ones(numbers[0])].join ' '
12
- end
13
-
14
-
15
- def hundreds number, options = {}
16
- options[:is_hundred] = false if options[:is_hundred].nil?
17
- options[:is_hundred] ? t(:one_hundred) : t(:hundreds)[number - 1]
8
+ def hundreds(number, _options = {})
9
+ t(:hundreds)[number]
18
10
  end
19
11
  end
20
12
  end
@@ -1,14 +1,26 @@
1
+ # frozen_string_literal: true
2
+
1
3
  module NumbersAndWords
2
4
  module Translations
3
5
  class Nl < Base
4
6
  include NumbersAndWords::Translations::Families::Latin
5
7
 
6
- def tens_with_ones numbers, options = {}
7
- [ones(numbers[0]), tens(numbers[1])].join 'en'
8
+ def tens_with_ones(numbers, _options = {})
9
+ [ones(numbers[0]), tens(numbers[1])].join(union(numbers[0]))
10
+ end
11
+
12
+ def hundreds(number, _options = {})
13
+ return t(:hundreds) if number == 1
14
+
15
+ super number, separator: ''
8
16
  end
9
17
 
10
- def hundreds number, options = {}
11
- 1 == number ? t(:hundreds) : [t(:ones)[number], t(:hundreds)].join
18
+ private
19
+
20
+ def union(units)
21
+ return t :union2or3 if [2, 3].include?(units)
22
+
23
+ t :union
12
24
  end
13
25
  end
14
26
  end
@@ -0,0 +1,77 @@
1
+ # frozen_string_literal: true
2
+
3
+ module NumbersAndWords
4
+ module Translations
5
+ class PtBr < Base
6
+ include NumbersAndWords::Translations::Families::Base
7
+ include NumbersAndWords::Translations::Extensions::FractionSignificance
8
+
9
+ def integral(number, _options = {})
10
+ t(:integral, count: number)
11
+ end
12
+
13
+ def zero(options = {})
14
+ t([options[:prefix], :ones, :male].join('.'))[0]
15
+ end
16
+
17
+ def ones(number, options = {})
18
+ return if options[:is_one_thousand]
19
+
20
+ t([options[:prefix], :ones, options[:gender]].join('.'))[number]
21
+ end
22
+
23
+ def tens(number, options = {})
24
+ path = [options[:prefix], :tens]
25
+ path.push(options[:gender]) if ordinal?(options)
26
+ t(path.join('.'))[number]
27
+ end
28
+
29
+ def teens(number, options = {})
30
+ return [tens(1, options), ones(number[0], options)].join(' ') if ordinal? options
31
+
32
+ super(number, options)
33
+ end
34
+
35
+ def tens_with_ones(numbers, options = {})
36
+ connector = ordinal?(options) ? ' ' : " #{union} "
37
+ [tens(numbers[1], options), ones(numbers[0], options)].join(connector)
38
+ end
39
+
40
+ def hundreds(number, options = {})
41
+ return t(:one_hundred) if options[:is_one_hundred] && !ordinal?(options)
42
+
43
+ hundreds = t([options[:prefix], :hundreds, options[:gender]].join('.'))[number]
44
+ return hundreds if ordinal?(options) || options[:is_hundred]
45
+
46
+ [hundreds, union].join(' ')
47
+ end
48
+
49
+ def megs(capacity, options = {})
50
+ return t([options[:prefix], :mega, options[:gender]].join('.'))[capacity] if ordinal?(options)
51
+ return super(capacity, options) if options[:is_opaque] || options[:is_without_connector]
52
+
53
+ suffix = options[:is_with_comma] ? ',' : " #{union}"
54
+ super(capacity, options) + suffix
55
+ end
56
+
57
+ def micros(capacity, number = nil)
58
+ micro, prefix = capacity
59
+ micros = number ? t(micro(micro), count: number) : micro(micro)
60
+ [micro_prefix(prefix, number), micros].compact.join(t('micro_prefix.union'))
61
+ end
62
+
63
+ def micro_prefix(capacity, number)
64
+ case capacity
65
+ when 2 then t('micro_prefix.hundreds', count: number)
66
+ when 1 then t('micro_prefix.tens', count: number)
67
+ end
68
+ end
69
+
70
+ private
71
+
72
+ def ordinal?(options)
73
+ options[:prefix] == :ordinal
74
+ end
75
+ end
76
+ end
77
+ end
@@ -0,0 +1,20 @@
1
+ # frozen_string_literal: true
2
+
3
+ module NumbersAndWords
4
+ module Translations
5
+ class Pt < Base
6
+ include NumbersAndWords::Translations::Families::Latin
7
+
8
+ def tens_with_ones(numbers, _options = {})
9
+ super numbers, separator: " #{union} "
10
+ end
11
+
12
+ def hundreds(number, options = {})
13
+ return t(:one_hundred) if options[:is_one_hundred]
14
+ return t(:hundreds)[number] if options[:is_hundred]
15
+
16
+ [t(:hundreds)[number], union].join(' ')
17
+ end
18
+ end
19
+ end
20
+ end
@@ -1,25 +1,10 @@
1
+ # frozen_string_literal: true
2
+
1
3
  module NumbersAndWords
2
4
  module Translations
3
5
  class Ru < Base
4
6
  include NumbersAndWords::Translations::Families::Cyrillic
5
7
  include NumbersAndWords::Translations::Extensions::FractionSignificance
6
-
7
- def micros capacity, number = nil, separator = ' '
8
- micro, prefix = capacity
9
- micros = t(:micro, :count => number)[micro]
10
- [micro_prefix(prefix), micros].compact.join separator
11
- end
12
-
13
- def micro_prefix capacity
14
- case capacity
15
- when 2 then t(:sub_micro)[2]
16
- when 1 then t(:sub_micro)[1]
17
- end
18
- end
19
-
20
- #def fraction_separator options = {}
21
- # super if options[:with_fractional_separator]
22
- #end
23
8
  end
24
9
  end
25
10
  end
@@ -1,10 +1,12 @@
1
+ # frozen_string_literal: true
2
+
1
3
  module NumbersAndWords
2
4
  module Translations
3
5
  class Se < Base
4
6
  include NumbersAndWords::Translations::Families::Latin
5
7
 
6
- def tens_with_ones numbers, options = {}
7
- super numbers, :separator => '-'
8
+ def tens_with_ones(numbers, _options = {})
9
+ super numbers, separator: '-'
8
10
  end
9
11
  end
10
12
  end
@@ -1,10 +1,16 @@
1
+ # frozen_string_literal: true
2
+
1
3
  module NumbersAndWords
2
4
  module Translations
3
5
  class Tr < Base
4
6
  include NumbersAndWords::Translations::Families::Latin
5
7
 
6
- def tens_with_ones numbers, options = {}
7
- super numbers, :separator => ' '
8
+ def hundreds(number, options = {})
9
+ if number == 1
10
+ [t([options[:prefix], :hundreds].join('.'))].join options[:separator] || ' '
11
+ else
12
+ [t(:ones)[number], t([options[:prefix], :hundreds].join('.'))].join options[:separator] || ' '
13
+ end
8
14
  end
9
15
  end
10
16
  end
@@ -1,21 +1,10 @@
1
+ # frozen_string_literal: true
2
+
1
3
  module NumbersAndWords
2
4
  module Translations
3
5
  class Ua < Base
4
6
  include NumbersAndWords::Translations::Families::Cyrillic
5
7
  include NumbersAndWords::Translations::Extensions::FractionSignificance
6
-
7
- def micros capacity, number = nil, separator = ' '
8
- micro, prefix = capacity
9
- micros = t(:micro, :count => number)[micro]
10
- [micro_prefix(prefix), micros].compact.join separator
11
- end
12
-
13
- def micro_prefix capacity
14
- case capacity
15
- when 2 then t(:sub_micro)[2]
16
- when 1 then t(:sub_micro)[1]
17
- end
18
- end
19
8
  end
20
9
  end
21
10
  end
@@ -0,0 +1,24 @@
1
+ # frozen_string_literal: true
2
+
3
+ module NumbersAndWords
4
+ module Translations
5
+ class Vi < Base
6
+ include NumbersAndWords::Translations::Families::Latin
7
+ include NumbersAndWords::Translations::Extensions::FractionSignificance
8
+ def ones_of_tens(number, options = {})
9
+ return t('units.tens.one') if number == 1
10
+ return t('units.tens.five') if number == 5
11
+
12
+ ones(number, options)
13
+ end
14
+
15
+ def tens_with_ones(numbers, options = {})
16
+ [tens(numbers[1]), ones_of_tens(numbers[0], options)].join options[:separator] || ' '
17
+ end
18
+
19
+ def ones_union(number, options = {})
20
+ [t(:ones_union), ones(number, options)].join options[:separator] || ' '
21
+ end
22
+ end
23
+ end
24
+ end
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  require 'numbers_and_words/translations/base'
2
4
  require 'numbers_and_words/translations/families/base'
3
5
  require 'numbers_and_words/translations/families/cyrillic'
@@ -5,7 +7,7 @@ require 'numbers_and_words/translations/families/latin'
5
7
  require 'numbers_and_words/translations/extensions/fraction_significance'
6
8
  require 'numbers_and_words/translations/ru'
7
9
  require 'numbers_and_words/translations/en'
8
- require 'numbers_and_words/translations/en_gb'
10
+ require 'numbers_and_words/translations/en-GB'
9
11
  require 'numbers_and_words/translations/ua'
10
12
  require 'numbers_and_words/translations/tr'
11
13
  require 'numbers_and_words/translations/fr'
@@ -18,12 +20,19 @@ require 'numbers_and_words/translations/es'
18
20
  require 'numbers_and_words/translations/lv'
19
21
  require 'numbers_and_words/translations/lt'
20
22
  require 'numbers_and_words/translations/de'
23
+ require 'numbers_and_words/translations/pt'
24
+ require 'numbers_and_words/translations/pt-BR'
25
+ require 'numbers_and_words/translations/ka'
26
+ require 'numbers_and_words/translations/cs'
27
+ require 'numbers_and_words/translations/vi'
28
+ require 'numbers_and_words/translations/hy'
29
+ require 'numbers_and_words/translations/kz'
21
30
 
22
31
  module NumbersAndWords
23
32
  module Translations
24
33
  class << self
25
34
  def factory
26
- "#{name}::#{I18n.language_class_name}".constantize.new
35
+ Object.const_get("#{name}::#{I18n.language_class_name}").new
27
36
  end
28
37
  end
29
38
  end
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  module NumbersAndWords
2
- VERSION = '0.10.0'
4
+ VERSION = '0.11.12'
3
5
  end