RubyGems - twitter_cldr - Versions diffs - 1.5.0 → 1.6.0 - Mend

twitter_cldr 1.5.0 → 1.6.0

Files changed (203) hide show

data/Gemfile +32 -0
data/History.txt +78 -0
data/README.md +72 -62
data/Rakefile +22 -0
data/js/lib/compiler.rb +40 -0
data/js/lib/mustache/bundle.coffee +14 -0
data/js/lib/mustache/calendars/datetime.coffee +240 -0
data/js/lib/mustache/calendars/timespan.coffee +52 -0
data/js/lib/mustache/plurals/rules.coffee +14 -0
data/js/lib/renderers/base.rb +18 -0
data/js/lib/renderers/bundle.rb +18 -0
data/js/lib/renderers/calendars/datetime_renderer.rb +34 -0
data/js/lib/renderers/calendars/timespan_renderer.rb +39 -0
data/js/lib/renderers/plurals/rules/plural_rules_compiler.rb +89 -0
data/js/lib/renderers/plurals/rules/plural_rules_renderer.rb +26 -0
data/js/lib/twitter_cldr_js.rb +85 -0
data/js/spec/js/calendars/datetime_spec.js +418 -0
data/js/spec/js/calendars/timespan_spec.js +91 -0
data/js/spec/js/plurals/plural_rules_spec.js +28 -0
data/js/spec/js/support/jasmine.yml +8 -0
data/js/spec/rb/renderers/plurals/plural_rules_compiler_spec.rb +52 -0
data/js/spec/rb/spec_helper.rb +13 -0
data/lib/twitter_cldr.rb +2 -1
data/lib/twitter_cldr/collation.rb +2 -1
data/lib/twitter_cldr/collation/collator.rb +49 -31
data/lib/twitter_cldr/collation/{sort_key.rb → sort_key_builder.rb} +31 -8
data/lib/twitter_cldr/collation/trie.rb +116 -24
data/lib/twitter_cldr/collation/trie_builder.rb +54 -28
data/lib/twitter_cldr/collation/trie_with_fallback.rb +55 -0
data/lib/twitter_cldr/core_ext/array.rb +14 -1
data/lib/twitter_cldr/core_ext/calendars/datetime.rb +8 -2
data/lib/twitter_cldr/core_ext/calendars/timespan.rb +5 -5
data/lib/twitter_cldr/formatters/calendars/timespan_formatter.rb +10 -10
data/lib/twitter_cldr/formatters/plurals/rules.rb +3 -5
data/lib/twitter_cldr/resources.rb +11 -0
data/lib/twitter_cldr/resources/import.rb +12 -0
data/lib/twitter_cldr/resources/import/tailoring.rb +193 -0
data/lib/twitter_cldr/{shared/resources.rb → resources/loader.rb} +17 -4
data/lib/twitter_cldr/shared.rb +0 -1
data/lib/twitter_cldr/tokenizers/base.rb +9 -9
data/lib/twitter_cldr/tokenizers/calendars/datetime_tokenizer.rb +0 -4
data/lib/twitter_cldr/tokenizers/calendars/timespan_tokenizer.rb +21 -7
data/lib/twitter_cldr/utils.rb +11 -0
data/lib/twitter_cldr/version.rb +1 -1
data/resources/collation/tailoring/af.yml +3 -0
data/resources/collation/tailoring/ar.yml +21 -0
data/resources/collation/tailoring/ca.yml +9 -0
data/resources/collation/tailoring/cs.yml +25 -0
data/resources/collation/tailoring/da.yml +59 -0
data/resources/collation/tailoring/de.yml +3 -0
data/resources/collation/tailoring/el.yml +3 -0
data/resources/collation/tailoring/en.yml +3 -0
data/resources/collation/tailoring/es.yml +5 -0
data/resources/collation/tailoring/eu.yml +3 -0
data/resources/collation/tailoring/fa.yml +73 -0
data/resources/collation/tailoring/fi.yml +61 -0
data/resources/collation/tailoring/fil.yml +11 -0
data/resources/collation/tailoring/fr.yml +3 -0
data/resources/collation/tailoring/he.yml +3 -0
data/resources/collation/tailoring/hi.yml +7 -0
data/resources/collation/tailoring/hu.yml +125 -0
data/resources/collation/tailoring/id.yml +3 -0
data/resources/collation/tailoring/it.yml +3 -0
data/resources/collation/tailoring/ja.yml +14647 -0
data/resources/collation/tailoring/ko.yml +14953 -0
data/resources/collation/tailoring/ms.yml +3 -0
data/resources/collation/tailoring/nb.yml +59 -0
data/resources/collation/tailoring/nl.yml +3 -0
data/resources/collation/tailoring/pl.yml +37 -0
data/resources/collation/tailoring/pt.yml +3 -0
data/resources/collation/tailoring/ru.yml +3 -0
data/resources/collation/tailoring/sv.yml +63 -0
data/resources/collation/tailoring/th.yml +19 -0
data/resources/collation/tailoring/tr.yml +27 -0
data/resources/collation/tailoring/uk.yml +5 -0
data/resources/collation/tailoring/ur.yml +163 -0
data/resources/collation/tailoring/zh-Hant.yml +3 -0
data/resources/collation/tailoring/zh.yml +149 -0
data/resources/custom/locales/af/units.yml +19 -0
data/resources/custom/locales/ar/units.yml +35 -0
data/resources/custom/locales/ca/units.yml +19 -0
data/resources/custom/locales/cs/units.yml +23 -0
data/resources/custom/locales/da/units.yml +19 -0
data/resources/custom/locales/de/units.yml +19 -0
data/resources/custom/locales/el/units.yml +19 -0
data/resources/custom/locales/en/units.yml +18 -0
data/resources/custom/locales/es/units.yml +19 -0
data/resources/custom/locales/eu/units.yml +19 -0
data/resources/custom/locales/fa/units.yml +15 -0
data/resources/custom/locales/fi/units.yml +19 -0
data/resources/custom/locales/fil/units.yml +19 -0
data/resources/custom/locales/fr/units.yml +19 -0
data/resources/custom/locales/he/units.yml +19 -0
data/resources/custom/locales/hi/units.yml +19 -0
data/resources/custom/locales/hu/units.yml +15 -0
data/resources/custom/locales/id/units.yml +15 -0
data/resources/custom/locales/it/units.yml +19 -0
data/resources/custom/locales/ja/units.yml +15 -0
data/resources/custom/locales/ko/units.yml +15 -0
data/resources/custom/locales/ms/units.yml +15 -0
data/resources/custom/locales/nb/units.yml +19 -0
data/resources/custom/locales/nl/units.yml +19 -0
data/resources/custom/locales/pl/units.yml +23 -0
data/resources/custom/locales/pt/units.yml +19 -0
data/resources/custom/locales/ru/units.yml +27 -0
data/resources/custom/locales/sv/units.yml +19 -0
data/resources/custom/locales/th/units.yml +15 -0
data/resources/custom/locales/tr/units.yml +15 -0
data/resources/custom/locales/uk/units.yml +27 -0
data/resources/custom/locales/ur/units.yml +19 -0
data/resources/custom/locales/zh-Hant/units.yml +15 -0
data/resources/custom/locales/zh/units.yml +15 -0
data/resources/locales/af/units.yml +112 -65
data/resources/locales/ar/units.yml +196 -126
data/resources/locales/ca/units.yml +112 -70
data/resources/locales/cs/units.yml +140 -91
data/resources/locales/da/units.yml +98 -56
data/resources/locales/de/units.yml +112 -70
data/resources/locales/el/units.yml +119 -84
data/resources/locales/en/units.yml +84 -42
data/resources/locales/es/units.yml +112 -70
data/resources/locales/eu/units.yml +105 -68
data/resources/locales/fa/units.yml +98 -63
data/resources/locales/fi/units.yml +112 -70
data/resources/locales/fil/units.yml +98 -56
data/resources/locales/fr/units.yml +112 -70
data/resources/locales/he/units.yml +98 -56
data/resources/locales/hi/units.yml +98 -56
data/resources/locales/hu/units.yml +84 -49
data/resources/locales/id/units.yml +84 -49
data/resources/locales/it/units.yml +98 -56
data/resources/locales/ja/units.yml +84 -49
data/resources/locales/ko/units.yml +84 -49
data/resources/locales/ms/units.yml +112 -63
data/resources/locales/nb/units.yml +106 -64
data/resources/locales/nl/units.yml +98 -56
data/resources/locales/pl/units.yml +181 -112
data/resources/locales/pt/units.yml +112 -70
data/resources/locales/ru/units.yml +168 -112
data/resources/locales/sv/units.yml +112 -70
data/resources/locales/th/units.yml +84 -49
data/resources/locales/tr/units.yml +84 -49
data/resources/locales/uk/units.yml +168 -112
data/resources/locales/ur/units.yml +112 -63
data/resources/locales/zh-Hant/units.yml +84 -49
data/resources/locales/zh/units.yml +84 -49
data/spec/collation/collation_spec.rb +1 -1
data/spec/collation/collator_spec.rb +120 -48
data/spec/collation/sort_key_builder_spec.rb +80 -0
data/spec/collation/tailoring_spec.rb +137 -0
data/spec/collation/tailoring_tests/af.txt +321 -0
data/spec/collation/tailoring_tests/ar.txt +188 -0
data/spec/collation/tailoring_tests/ca.txt +446 -0
data/spec/collation/tailoring_tests/cs.txt +273 -0
data/spec/collation/tailoring_tests/da.txt +293 -0
data/spec/collation/tailoring_tests/de.txt +414 -0
data/spec/collation/tailoring_tests/el.txt +228 -0
data/spec/collation/tailoring_tests/en.txt +399 -0
data/spec/collation/tailoring_tests/es.txt +402 -0
data/spec/collation/tailoring_tests/eu.txt +183 -0
data/spec/collation/tailoring_tests/fa.txt +263 -0
data/spec/collation/tailoring_tests/fi.txt +389 -0
data/spec/collation/tailoring_tests/fil.txt +279 -0
data/spec/collation/tailoring_tests/fr.txt +363 -0
data/spec/collation/tailoring_tests/he.txt +167 -0
data/spec/collation/tailoring_tests/hi.txt +230 -0
data/spec/collation/tailoring_tests/hu.txt +773 -0
data/spec/collation/tailoring_tests/id.txt +171 -0
data/spec/collation/tailoring_tests/it.txt +231 -0
data/spec/collation/tailoring_tests/ja.txt +4287 -0
data/spec/collation/tailoring_tests/ko.txt +1761 -0
data/spec/collation/tailoring_tests/ms.txt +531 -0
data/spec/collation/tailoring_tests/nb.txt +375 -0
data/spec/collation/tailoring_tests/nl.txt +273 -0
data/spec/collation/tailoring_tests/pl.txt +225 -0
data/spec/collation/tailoring_tests/pt.txt +405 -0
data/spec/collation/tailoring_tests/ru.txt +213 -0
data/spec/collation/tailoring_tests/sv.txt +353 -0
data/spec/collation/tailoring_tests/th.txt +239 -0
data/spec/collation/tailoring_tests/tr.txt +414 -0
data/spec/collation/tailoring_tests/uk.txt +218 -0
data/spec/collation/tailoring_tests/ur.txt +284 -0
data/spec/collation/tailoring_tests/zh-Hant.txt +626 -0
data/spec/collation/tailoring_tests/zh.txt +717 -0
data/spec/collation/trie_builder_spec.rb +131 -51
data/spec/collation/trie_spec.rb +301 -26
data/spec/collation/trie_with_fallback_spec.rb +41 -0
data/spec/core_ext/array_spec.rb +46 -3
data/spec/core_ext/calendars/date_spec.rb +24 -24
data/spec/core_ext/calendars/datetime_spec.rb +7 -0
data/spec/core_ext/calendars/time_spec.rb +2 -2
data/spec/formatters/calendars/timespan_formatter_spec.rb +47 -18
data/spec/formatters/plurals/rules_spec.rb +3 -11
data/spec/readme_spec.rb +15 -15
data/spec/resources/loader_spec.rb +94 -0
data/spec/spec_helper.rb +6 -0
data/spec/tokenizers/calendars/timespan_tokenizer_spec.rb +1 -1
data/spec/twitter_cldr_spec.rb +3 -3
data/spec/utils_spec.rb +38 -0
data/twitter_cldr.gemspec +25 -0
metadata +156 -110
data/spec/collation/sort_key_spec.rb +0 -56
data/spec/shared/resources_spec.rb +0 -75

data/resources/locales/ar/units.yml CHANGED Viewed

@@ -1,149 +1,219 @@
 ar:
   units:
     day:
-      few: "{0} أيام"
-      many: "{0} يوماً"
-      one: يوم
-      other: "{0} يوم"
-      two: يومان
-      zero: "لا أيام"
+      default:
+        few: "{0} أيام"
+        many: "{0} يوماً"
+        one: "يوم"
+        other: "{0} يوم"
+        two: "يومان"
+        zero: "لا أيام"
+      short:
+        few: "{0} أيام"
+        many: "{0} يوماً"
+        one: "يوم"
+        other: "{0} يوم"
+        two: "يومان"
+        zero: "لا أيام"
     day-future:
-      0: "خلال 0 يوم"
-      1: "خلال يوم واحد"
-      few: "خلال {0} أيام"
-      many: "خلال {0} يومًا"
-      other: "خلال {0} من الأيام"
-      two: "خلال يومين"
+      default:
+        0: "خلال 0 يوم"
+        1: "خلال يوم واحد"
+        few: "خلال {0} أيام"
+        many: "خلال {0} يومًا"
+        other: "خلال {0} من الأيام"
+        two: "خلال يومين"
     day-past:
-      0: "قبل 0 يوم"
-      1: "قبل يوم واحد"
-      few: "قبل {0} أيام"
-      many: "قبل {0} يومًا"
-      other: "قبل {0} من الأيام"
-      two: "قبل يومين"
+      default:
+        0: "قبل 0 يوم"
+        1: "قبل يوم واحد"
+        few: "قبل {0} أيام"
+        many: "قبل {0} يومًا"
+        other: "قبل {0} من الأيام"
+        two: "قبل يومين"
     hour:
-      few: "{0} س"
-      many: "{0} س"
-      one: ساعة
-      other: "{0} س"
-      two: ساعتان
-      zero: "لا ساعات"
+      default:
+        few: "{0} ساعات"
+        many: "{0} ساعةً"
+        one: ساعة
+        other: "{0} ساعة"
+        two: ساعتان
+        zero: "لا ساعات"
+      short:
+        few: "{0} س"
+        many: "{0} س"
+        one: ساعة
+        other: "{0} س"
+        two: ساعتان
+        zero: "لا ساعات"
     hour-future:
-      0: "خلال 0 ساعة"
-      1: "خلال ساعة واحدة"
-      few: "خلال {0} ساعات"
-      many: "خلال {0} ساعة"
-      other: "خلال {0} من الساعات"
-      two: "خلال ساعتين"
+      default:
+        0: "خلال 0 ساعة"
+        1: "خلال ساعة واحدة"
+        few: "خلال {0} ساعات"
+        many: "خلال {0} ساعة"
+        other: "خلال {0} من الساعات"
+        two: "خلال ساعتين"
     hour-past:
-      0: "قبل 0 ساعة"
-      1: "قبل ساعة واحدة"
-      few: "قبل {0} ساعات"
-      many: "قبل {0} ساعة"
-      other: "قبل {0} من الساعات"
-      two: "قبل ساعتين"
+      default:
+        0: "قبل 0 ساعة"
+        1: "قبل ساعة واحدة"
+        few: "قبل {0} ساعات"
+        many: "قبل {0} ساعة"
+        other: "قبل {0} من الساعات"
+        two: "قبل ساعتين"
     minute:
-      few: "{0} د"
-      many: "{0} د"
-      one: دقيقة
-      other: "{0} د"
-      two: دقيقتان
-      zero: "لا دقائق"
+      default:
+        few: "{0} دقائق"
+        many: "{0} دقيقةً"
+        one: دقيقة
+        other: "{0} دقيقة"
+        two: دقيقتان
+        zero: "لا دقائق"
+      short:
+        few: "{0} د"
+        many: "{0} د"
+        one: دقيقة
+        other: "{0} د"
+        two: دقيقتان
+        zero: "لا دقائق"
     minute-future:
-      0: "خلال 0 دقيقة"
-      1: "خلال دقيقة واحدة"
-      few: "خلال {0} دقائق"
-      many: "خلال {0} دقيقة"
-      other: "خلال {0} من الدقائق"
-      two: "خلال دقيقتين"
+      default:
+        0: "خلال 0 دقيقة"
+        1: "خلال دقيقة واحدة"
+        few: "خلال {0} دقائق"
+        many: "خلال {0} دقيقة"
+        other: "خلال {0} من الدقائق"
+        two: "خلال دقيقتين"
     minute-past:
-      0: "قبل 0 دقيقة"
-      1: "قبل دقيقة واحدة"
-      few: "قبل {0} دقائق"
-      many: "قبل {0} دقيقة"
-      other: "قبل {0} من الدقائق"
-      two: "قبل دقيقتين"
+      default:
+        0: "قبل 0 دقيقة"
+        1: "قبل دقيقة واحدة"
+        few: "قبل {0} دقائق"
+        many: "قبل {0} دقيقة"
+        other: "قبل {0} من الدقائق"
+        two: "قبل دقيقتين"
     month:
-      few: "{0} أشهر"
-      many: "{0} شهراً"
-      one: شهر
-      other: "{0} شهر"
-      two: شهران
-      zero: "لا أشهر"
+      default:
+        few: "{0} أشهر"
+        many: "{0} شهراً"
+        one: شهر
+        other: "{0} شهر"
+        two: شهران
+        zero: "لا أشهر"
+      short:
+        few: "{0} أشهر"
+        many: "{0} شهراً"
+        one: شهر
+        other: "{0} شهر"
+        two: شهران
+        zero: "لا أشهر"
     month-future:
-      0: "خلال 0 شهر"
-      1: "خلال شهر واحد"
-      few: "خلال {0} شهور"
-      many: "خلال {0} شهرًا"
-      other: "خلال {0} من الشهور"
-      two: "خلال شهرين"
+      default:
+        0: "خلال 0 شهر"
+        1: "خلال شهر واحد"
+        few: "خلال {0} شهور"
+        many: "خلال {0} شهرًا"
+        other: "خلال {0} من الشهور"
+        two: "خلال شهرين"
     month-past:
-      0: "قبل 0 شهر"
-      1: "قبل شهر واحد"
-      few: "قبل {0} أشهر"
-      many: "قبل {0} شهرًا"
-      other: "قبل {0} من الشهور"
-      two: "قبل شهرين"
+      default:
+        0: "قبل 0 شهر"
+        1: "قبل شهر واحد"
+        few: "قبل {0} أشهر"
+        many: "قبل {0} شهرًا"
+        other: "قبل {0} من الشهور"
+        two: "قبل شهرين"
     second:
-      few: "{0} ث"
-      many: "{0} ث"
-      one: ثانية
-      other: "{0} ث"
-      two: ثانيتان
-      zero: "لا ثوان"
+      default:
+        few: "{0} ثوان"
+        many: "{0} ثانيةً"
+        one: ثانية
+        other: "{0} ثانية"
+        two: ثانيتان
+        zero: "لا ثوان"
+      short:
+        few: "{0} ث"
+        many: "{0} ث"
+        one: ثانية
+        other: "{0} ث"
+        two: ثانيتان
+        zero: "لا ثوان"
     second-future:
-      0: "خلال 0 ثانية"
-      1: "خلال ثانية واحدة"
-      few: "خلال {0} ثوانِ"
-      many: "خلال {0} ثانية"
-      other: "خلال {0} من الثواني"
-      two: "خلال ثانيتين"
+      default:
+        0: "خلال 0 ثانية"
+        1: "خلال ثانية واحدة"
+        few: "خلال {0} ثوانِ"
+        many: "خلال {0} ثانية"
+        other: "خلال {0} من الثواني"
+        two: "خلال ثانيتين"
     second-past:
-      0: "قبل 0 ثانية"
-      1: "قبل ثانية واحدة"
-      few: "قبل {0} ثوانِ"
-      many: "قبل {0} ثانية"
-      other: "قبل {0} من الثواني"
-      two: "قبل ثانيتين"
+      default:
+        0: "قبل 0 ثانية"
+        1: "قبل ثانية واحدة"
+        few: "قبل {0} ثوانِ"
+        many: "قبل {0} ثانية"
+        other: "قبل {0} من الثواني"
+        two: "قبل ثانيتين"
     week:
-      few: "{0} أسابيع"
-      many: "{0} أسبوعاً"
-      one: أسبوع
-      other: "{0} أسبوع"
-      two: أسبوعان
-      zero: "لا أسابيع"
+      default:
+        few: "{0} أسابيع"
+        many: "{0} أسبوعاً"
+        one: أسبوع
+        other: "{0} أسبوع"
+        two: أسبوعان
+        zero: "لا أسابيع"
+      short:
+        few: "{0} أسابيع"
+        many: "{0} أسبوعاً"
+        one: أسبوع
+        other: "{0} أسبوع"
+        two: أسبوعان
+        zero: "لا أسابيع"
     week-future:
-      0: "خلال 0 أسبوع"
-      1: "خلال أسبوع واحد"
-      few: "خلال {0} أسابيع"
-      many: "خلال {0} أسبوعًا"
-      other: "خلال {0} من الأسابيع"
-      two: "خلال أسبوعين"
+      default:
+        0: "خلال 0 أسبوع"
+        1: "خلال أسبوع واحد"
+        few: "خلال {0} أسابيع"
+        many: "خلال {0} أسبوعًا"
+        other: "خلال {0} من الأسابيع"
+        two: "خلال أسبوعين"
     week-past:
-      0: "قبل 0 أسبوع"
-      1: "قبل أسبوع واحد"
-      few: "قبل {0} أسابيع"
-      many: "قبل {0} أسبوعًا"
-      other: "قبل {0} من الأسابيع"
-      two: "قبل أسبوعين"
+      default:
+        0: "قبل 0 أسبوع"
+        1: "قبل أسبوع واحد"
+        few: "قبل {0} أسابيع"
+        many: "قبل {0} أسبوعًا"
+        other: "قبل {0} من الأسابيع"
+        two: "قبل أسبوعين"
     year:
-      few: "{0} سنوات"
-      many: "{0} سنةً"
-      one: سنة
-      other: "{0} سنة"
-      two: سنتان
-      zero: "لا سنوات"
+      default:
+        few: "{0} سنوات"
+        many: "{0} سنةً"
+        one: سنة
+        other: "{0} سنة"
+        two: سنتان
+        zero: "لا سنوات"
+      short:
+        few: "{0} سنوات"
+        many: "{0} سنةً"
+        one: سنة
+        other: "{0} سنة"
+        two: سنتان
+        zero: "لا سنوات"
     year-future:
-      0: "خلال 0 سنة"
-      1: "خلال سنة واحدة"
-      few: "خلال {0} سنوات"
-      many: "خلال {0} سنة"
-      other: "خلال {0} من السنوات"
-      two: "خلال سنتين"
+      default:
+        0: "خلال 0 سنة"
+        1: "خلال سنة واحدة"
+        few: "خلال {0} سنوات"
+        many: "خلال {0} سنة"
+        other: "خلال {0} من السنوات"
+        two: "خلال سنتين"
     year-past:
-      0: "قبل 0 سنة"
-      1: "قبل سنة واحدة"
-      few: "قبل {0} سنوات"
-      many: "قبل {0} سنة"
-      other: "قبل {0} من السنوات"
-      two: "قبل سنتين"
+      default:
+        0: "قبل 0 سنة"
+        1: "قبل سنة واحدة"
+        few: "قبل {0} سنوات"
+        many: "قبل {0} سنة"
+        other: "قبل {0} من السنوات"
+        two: "قبل سنتين"

data/resources/locales/ca/units.yml CHANGED Viewed

@@ -1,93 +1,135 @@
 ca:
   units:
     day:
-      one: "{0} dia"
-      other: "{0} dies"
+      default:
+        one: "{0} dia"
+        other: "{0} dies"
+      short:
+        one: "{0} dia"
+        other: "{0} dies"
     day-future:
-      0: "D'aquí a 0 dies"
-      1: "D'aquí a 1 dia"
-      one: "D'aquí a {0} dia"
-      other: "D'aquí a {0} dies"
+      default:
+        0: "D'aquí a 0 dies"
+        1: "D'aquí a 1 dia"
+        one: "D'aquí a {0} dia"
+        other: "D'aquí a {0} dies"
     day-past:
-      0: "Fa 0 dies"
-      1: "Fa 1 dia"
-      one: "Fa {0} dia"
-      other: "Fa {0} dies"
+      default:
+        0: "Fa 0 dies"
+        1: "Fa 1 dia"
+        one: "Fa {0} dia"
+        other: "Fa {0} dies"
     hour:
-      one: "{0} h"
-      other: "{0} h"
+      default:
+        one: "{0} hora"
+        other: "{0} hores"
+      short:
+        one: "{0} h"
+        other: "{0} h"
     hour-future:
-      0: "D'aquí a 0 hores"
-      1: "D'aquí a 1 hora"
-      one: "D'aquí a {0} hora"
-      other: "D'aquí a {0} hores"
+      default:
+        0: "D'aquí a 0 hores"
+        1: "D'aquí a 1 hora"
+        one: "D'aquí a {0} hora"
+        other: "D'aquí a {0} hores"
     hour-past:
-      0: "Fa 0 hores"
-      1: "Fa 1 hora"
-      one: "Fa {0} hora"
-      other: "Fa {0} hores"
+      default:
+        0: "Fa 0 hores"
+        1: "Fa 1 hora"
+        one: "Fa {0} hora"
+        other: "Fa {0} hores"
     minute:
-      one: "{0} m"
-      other: "{0} m"
+      default:
+        one: "{0} minut"
+        other: "{0} minuts"
+      short:
+        one: "{0} m"
+        other: "{0} m"
     minute-future:
-      0: "D'aquí a 0 minuts"
-      1: "D'aquí a 1 minut"
-      one: "D'aquí a {0} minut"
-      other: "D'aquí a {0} minuts"
+      default:
+        0: "D'aquí a 0 minuts"
+        1: "D'aquí a 1 minut"
+        one: "D'aquí a {0} minut"
+        other: "D'aquí a {0} minuts"
     minute-past:
-      0: "Fa 0 minuts"
-      1: "Fa 1 minut"
-      one: "Fa {0} minut"
-      other: "Fa {0} minuts"
+      default:
+        0: "Fa 0 minuts"
+        1: "Fa 1 minut"
+        one: "Fa {0} minut"
+        other: "Fa {0} minuts"
     month:
-      one: "{0} mes"
-      other: "{0} mesos"
+      default:
+        one: "{0} mes"
+        other: "{0} mesos"
+      short:
+        one: "{0} mes"
+        other: "{0} mesos"
     month-future:
-      0: "D'aquí a 0 mesos"
-      1: "D'aquí a 1 mes"
-      one: "D'aquí a {0} mes"
-      other: "D'aquí a {0} mesos"
+      default:
+        0: "D'aquí a 0 mesos"
+        1: "D'aquí a 1 mes"
+        one: "D'aquí a {0} mes"
+        other: "D'aquí a {0} mesos"
     month-past:
-      0: "Fa 0 mesos"
-      1: "Fa 1 mes"
-      one: "Fa {0} mes"
-      other: "Fa {0} mesos"
+      default:
+        0: "Fa 0 mesos"
+        1: "Fa 1 mes"
+        one: "Fa {0} mes"
+        other: "Fa {0} mesos"
     second:
-      one: "{0} s"
-      other: "{0} s"
+      default:
+        one: "{0} segon"
+        other: "{0} segons"
+      short:
+        one: "{0} s"
+        other: "{0} s"
     second-future:
-      0: "D'aquí a 0 segons"
-      1: "D'aquí a 1 segon"
-      one: "D'aquí a {0} segon"
-      other: "D'aquí a {0} segons"
+      default:
+        0: "D'aquí a 0 segons"
+        1: "D'aquí a 1 segon"
+        one: "D'aquí a {0} segon"
+        other: "D'aquí a {0} segons"
     second-past:
-      0: "Fa 0 segons"
-      1: "Fa 1 segon"
-      one: "Fa {0} segon"
-      other: "Fa {0} segons"
+      default:
+        0: "Fa 0 segons"
+        1: "Fa 1 segon"
+        one: "Fa {0} segon"
+        other: "Fa {0} segons"
     week:
-      one: "{0} setmana"
-      other: "{0} setmanes"
+      default:
+        one: "{0} setmana"
+        other: "{0} setmanes"
+      short:
+        one: "{0} setmana"
+        other: "{0} setmanes"
     week-future:
-      0: "D'aquí a 0 setmanes"
-      1: "D'aquí a 1 setmana"
-      one: "D'aquí a {0} setmana"
-      other: "D'aquí a {0} setmanes"
+      default:
+        0: "D'aquí a 0 setmanes"
+        1: "D'aquí a 1 setmana"
+        one: "D'aquí a {0} setmana"
+        other: "D'aquí a {0} setmanes"
     week-past:
-      0: "Fa 0 setmanes"
-      1: "Fa 1 setmana"
-      one: "Fa {0} setmana"
-      other: "Fa {0} setmanes"
+      default:
+        0: "Fa 0 setmanes"
+        1: "Fa 1 setmana"
+        one: "Fa {0} setmana"
+        other: "Fa {0} setmanes"
     year:
-      one: "{0} any"
-      other: "{0} anys"
+      default:
+        one: "{0} any"
+        other: "{0} anys"
+      short:
+        one: "{0} any"
+        other: "{0} anys"
     year-future:
-      0: "D'aquí a 0 anys"
-      1: "D'aquí a 1 any"
-      one: "D'aquí a {0} any"
-      other: "D'aquí a {0} anys"
+      default:
+        0: "D'aquí a 0 anys"
+        1: "D'aquí a 1 any"
+        one: "D'aquí a {0} any"
+        other: "D'aquí a {0} anys"
     year-past:
-      0: "Fa 0 anys"
-      1: "Fa 1 any"
-      one: "Fa {0} any"
-      other: "Fa {0} anys"
+      default:
+        0: "Fa 0 anys"
+        1: "Fa 1 any"
+        one: "Fa {0} any"
+        other: "Fa {0} anys"