dotiw 5.3.3 → 5.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 156f786ed11b28af2e890b6612fb07fb09bd462dc818a5bb8bb9075a518044d7
-  data.tar.gz: ca01c5a48869011c7c1fe9f08cf8c6ad953920b4ea5bc4dd26e21850131b6363
+  metadata.gz: 1b9778f6b8dfb3fa5013f9e365c91be2fcb955f040e19dde50d8f70b1fb28fcd
+  data.tar.gz: 5213a53264dd238ea225939d53c40a63523749b92331ef4a899fa3ca190d5bce
 SHA512:
-  metadata.gz: 807d4628412b8d810c072ea5cf4e10ed2cb7e280bdeaeb1b65906f1e203bd1155c5a7457d21d4c8c8c112a5a7d0a9b9b9a3c9ff5f1100d6ff0a255f64380a1f3
-  data.tar.gz: 78c14c9c5ea09eb378a380fe686672e925665fdebd9f75096a5cdecc1f9d8497d9cf7839a8cad4dd9d84e4938441e1380c076ecb3ccbf0a24359aa70993da9a2
+  metadata.gz: 2efac079381c10ed7584f921dbeab2c3b4ae96f63a4b32c470a986a2a521f0a91c94e26871e92bcdcd9718d05d2bb6c41bc051155868b9c3684695b5b662d27e
+  data.tar.gz: 1506fe3f4715fd1f85b72d8de416d4dfdff144e02bce2837c741ab82d7928b2fed38e6c08fac19e1a5a0e155a9ec4c947407d1878107e5c15cc7947618f731dd

data/.github/workflows/ruby.yml

@@ -1,12 +1,6 @@
 name: Ruby
 
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
+on: [push, pull_request]
 
 jobs:
   build:
@@ -15,19 +9,33 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ruby-version: 2.5
-          - ruby-version: 2.6
-          - ruby-version: 2.4
-            bundler-version: 1.17.3
-            gemfile: gemfiles/rails_4.gemfile
-          - ruby-version: 2.6
+          - ruby-version: '4.0'
+          - ruby-version: '3.4'
+          - ruby-version: '3.3'
+          - ruby-version: '3.2'
+          - ruby-version: '3.1'
+          - ruby-version: '3.0'
+          - ruby-version: '2.7'
+          - ruby-version: '2.7'
             gemfile: gemfiles/rails_5.0.gemfile
-          - ruby-version: 2.6
+          - ruby-version: '2.7'
             gemfile: gemfiles/rails_5.1.gemfile
-          - ruby-version: 2.6
+          - ruby-version: '2.7'
             gemfile: gemfiles/rails_5.2.gemfile
-          - ruby-version: 2.6
+          - ruby-version: '3.4'
             gemfile: gemfiles/rails_6.0.gemfile
+          - ruby-version: '3.4'
+            gemfile: gemfiles/rails_7.0.gemfile
+          - ruby-version: '3.4'
+            gemfile: gemfiles/rails_7.1.gemfile
+          - ruby-version: '3.4'
+            gemfile: gemfiles/rails_7.2.gemfile
+          - ruby-version: '3.4'
+            gemfile: gemfiles/rails_8.0.gemfile
+          - ruby-version: '3.4'
+            gemfile: gemfiles/rails_8.1.gemfile
+          - ruby-version: '3.4'
+            gemfile: gemfiles/rails_8.1_i18n.gemfile
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby
@@ -43,3 +51,20 @@ jobs:
           gem install bundler -v ${BUNDLER:-2.1.4}
           bundle install --jobs 4 --retry 3
           bundle exec rake
+      - name: Upload coverage to Coveralls
+        if: matrix.ruby-version == '3.4'
+        uses: coverallsapp/github-action@v2
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          flag-name: ruby-${{ matrix.ruby-version }}-${{ matrix.gemfile }}
+          parallel: true
+
+  finish:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Close parallel build
+        uses: coverallsapp/github-action@v2
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          parallel-finished: true

data/.gitignore

@@ -1,5 +1,6 @@
 tmp
 pkg
+coverage
 spec/fixtures/database.yml
 .rvmrc
 Gemfile.lock

data/Appraisals

@@ -1,7 +1,3 @@
-appraise 'rails_4' do
-  gem 'rails', '~> 4.0'
-end
-
 appraise 'rails_5.0' do
   gem 'rails', '~> 5.0.0'
 end
@@ -17,3 +13,28 @@ end
 appraise 'rails_6.0' do
   gem 'rails', '~> 6.0.0'
 end
+
+appraise 'rails_7.0' do
+  gem 'rails', '~> 7.0.0'
+end
+
+appraise 'rails_7.1' do
+  gem 'rails', '~> 7.1.0'
+end
+
+appraise 'rails_7.2' do
+  gem 'rails', '~> 7.2.0'
+end
+
+appraise 'rails_8.0' do
+  gem 'rails', '~> 8.0.0'
+end
+
+appraise 'rails_8.1' do
+  gem 'rails', '~> 8.1.0'
+end
+
+appraise 'rails_8.1_i18n' do
+  gem 'rails', '~> 8.1.0'
+  gem 'rails-i18n'
+end

data/CHANGELOG.md

@@ -1,3 +1,29 @@
+## 5.6.0 (2026/8/28)
+
+* [#145](https://github.com/radar/distance_of_time_in_words/pull/145): Add `dotiw/core` require path to use dotiw without overriding the Rails date helpers, `DOTIW.distance_of_time_in_words` shortcut - [@ermolaev](https://github.com/ermolaev).
+* [#146](https://github.com/radar/distance_of_time_in_words/pull/146): Add support for Rails 8 - [@dblock](https://github.com/dblock).
+* [#147](https://github.com/radar/distance_of_time_in_words/pull/147): Add support for Rails 8.1, drop the `tzinfo ~> 1.2.7` development pin - [@ermolaev](https://github.com/ermolaev).
+* [#148](https://github.com/radar/distance_of_time_in_words/pull/148): Add `max_unit` option to express the entire distance as a single number in one unit - [@dblock](https://github.com/dblock).
+* [#79](https://github.com/radar/distance_of_time_in_words/issues/79): Speed up `distance_of_time_in_words` by avoiding `I18n.with_options`/`ActiveSupport::OptionMerger` allocation for translations, using `I18n.translate` directly instead - [@dblock](https://github.com/dblock).
+* [#77](https://github.com/radar/distance_of_time_in_words/issues/77), [#120](https://github.com/radar/distance_of_time_in_words/issues/120): Fix `only`/`except` discarding the duration of excluded fractions instead of folding them into the next smaller included fraction - [@dblock](https://github.com/dblock).
+* [#63](https://github.com/radar/distance_of_time_in_words/issues/63): Fix incorrect DST correction in timezones with an inverted DST scheme (e.g. Europe/Dublin) by comparing `utc_offset` instead of the unreliable `Time#dst?` - [@dblock](https://github.com/dblock).
+* [#153](https://github.com/radar/distance_of_time_in_words/issues/153): Fix leftover hours/minutes leaking a historical UTC offset change (e.g. Pacific/Norfolk's 2015 offset change) into the result instead of folding it into the calendar distance - [@dblock](https://github.com/dblock).
+* [#44](https://github.com/radar/distance_of_time_in_words/issues/44): Document that `vague: true` combined with a non-English `locale:` requires the host application to load Rails' own translations for that locale - [@dblock](https://github.com/dblock).
+* [#156](https://github.com/radar/distance_of_time_in_words/pull/156): Add Ruby 4.0 to the test matrix - [@dblock](https://github.com/dblock).
+* [#158](https://github.com/radar/distance_of_time_in_words/pull/158): Add test coverage reporting with SimpleCov and Coveralls, merged across all Ruby 3.4 CI jobs (default + pinned Rails gemfiles) using parallel builds - [@dblock](https://github.com/dblock).
+
+## 5.5.0 (2026/03/15)
+
+* [#131](https://github.com/radar/distance_of_time_in_words/pull/131): Deprecates `highest_measure_only`. Adds alternate form of `highest_measures` option to permit rounding up whatever part of the duration was previously silently discarded - [@seansfkelley](https://github.com/seansfkelley).
+* [#133](https://github.com/radar/distance_of_time_in_words/pull/133): Test on Ruby 3.0 and 3.1 - [@dblock](https://github.com/dblock).
+* [#134](https://github.com/radar/distance_of_time_in_words/pull/134): Add support for Dzongkha, the National language of Bhutan - [@KinWang-2013](https://github.com/KinWang-2013).
+* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Add support for Ruby 2.7 and 3.2, removed support for ruby 2.4, 2.5, 2.6 and Rails 4 - [@KinWang-2013](https://github.com/KinWang-2013).
+* [#136](https://github.com/radar/distance_of_time_in_words/pull/136): Add support for Rails 7 - [@KinWang-2013](https://github.com/KinWang-2013).
+* [#139](https://github.com/radar/distance_of_time_in_words/pull/139): Fix bug with pluralization of Russian translations for numbers ending in 1 - [@bitberry-dev](https://github.com/bitberry-dev).
+* [#140](https://github.com/radar/distance_of_time_in_words/pull/140): Add Ruby 3.3 and 3.4 support, added logger - [@dblock](https://github.com/dblock).
+* [#141](https://github.com/radar/distance_of_time_in_words/pull/141): Fix flaky time calculation test by explicitly setting timezone - [@bitberry-dev](https://github.com/bitberry-dev).
+* Fix bug when accumulating on years - [@radar](https://github.com/radar).
+
 ## 5.3.3 (2022/04/25)
 
 * [#128](https://github.com/radar/distance_of_time_in_words/pull/128): Adds support for numeric values for both the `from_time` and `to_time` arguments in the `#distance_of_time_in_words` helper - [@bjedrocha](https://github.com/bjedrocha).

data/CODEOWNERS

@@ -0,0 +1,2 @@
+@radar  
+*.gemspec @radar

data/README.markdown

@@ -1,4 +1,4 @@
-# dotiw ![Ruby](https://github.com/radar/distance_of_time_in_words/workflows/Ruby/badge.svg)
+# dotiw ![Ruby](https://github.com/radar/distance_of_time_in_words/workflows/Ruby/badge.svg) [![Coverage Status](https://coveralls.io/repos/github/radar/distance_of_time_in_words/badge.svg?branch=master)](https://coveralls.io/github/radar/distance_of_time_in_words?branch=master)
 
 The `dotiw` library that adds `distance_of_time_in_words` to any Ruby project, or overrides the default implementation in Rails with more accurate output.
 
@@ -32,6 +32,23 @@ include ActionView::Helpers::TextHelper
 include ActionView::Helpers::NumberHelper
 ```
 
+### Rails, without overriding the built-in helpers
+
+Requiring `dotiw` replaces the Rails implementation of `distance_of_time_in_words`
+and `time_ago_in_words`. If you would rather keep the built-in Rails helpers and
+call dotiw explicitly, require `dotiw/core` instead:
+
+```ruby
+gem 'dotiw', require: 'dotiw/core'
+```
+
+This loads `DOTIW::Methods` and the dotiw translations, but leaves
+`ActionView::Helpers::DateHelper` untouched:
+
+```ruby
+DOTIW.distance_of_time_in_words(from_time, to_time, highest_measures: 1)
+```
+
 ## distance\_of\_time\_in\_words
 
 Take this for a totally kick-ass example:
@@ -117,6 +134,8 @@ This will also be passed to `to_sentence`.
 
 Specify this if you want it to use the old `distance_of_time_in_words`. The value can be anything except `nil` or `false`.
 
+Note that `:vague` falls back to Rails/ActionView's own `distance_of_time_in_words`, which looks up its translations under `datetime.distance_in_words`. This namespace is provided by Rails core translations (e.g. via the [rails-i18n](https://github.com/svenfuchs/rails-i18n) gem) for non-English locales, not by dotiw. If you combine `:vague` with a non-English `:locale` and see a "translation missing" error, make sure your application also loads the corresponding Rails translations for that locale (see [#44](https://github.com/radar/distance_of_time_in_words/issues/44)).
+
 #### :include_seconds
 
 As described above this option is the equivalent to the third argument whether to include seconds.
@@ -130,40 +149,71 @@ Specifies the maximum output unit which will accumulate all the surplus. Say you
 => "121 minutes and 10 seconds"
 ```
 
+Note that units below `accumulate_on` are still shown separately. If you want the entire distance expressed as a single number in one unit, use `:max_unit` instead.
+
+#### :max_unit
+
+Expresses the entire distance as a single number in the given unit, discarding (flooring) any remainder smaller than that unit. Unlike `:accumulate_on`, no other units are shown in the output.
+
+```ruby
+>> distance_of_time_in_words(Time.now, Time.now + 1.day, true, max_unit: :seconds)
+=> "86400 seconds"
+
+>> distance_of_time_in_words(Time.now, Time.now + 3.days + 2.hours, true, max_unit: :hours)
+=> "74 hours"
+
+>> distance_of_time_in_words_hash(Time.now, Time.now + 3.days + 2.hours, max_unit: :hours)
+=> {hours: 74}
+```
+
+Valid units are `:seconds`, `:minutes`, `:hours`, `:days`, `:weeks`, `:months` and `:years`.
+
 #### :only
 
 Only want a specific measurement of time? No problem!
 
 ```ruby
 >> distance_of_time_in_words(Time.now, Time.now + 1.hour + 1.minute, false, only: :minutes)
-=> "1 minute"
+=> "61 minutes"
 ```
 
+Excluded measurements are folded into the next smaller included measurement instead of being
+discarded, so the returned duration is always accurate (1 hour + 1 minute = 61 minutes, not 1
+minute).
+
 You only want some? No problem too!
 
 ```ruby
 >> distance_of_time_in_words(Time.now, Time.now + 1.hour + 1.day + 1.minute, false, only: [:minutes, :hours])
-=> "1 hour and 1 minute"
+=> "25 hours and 1 minute"
 ```
 
+Here the excluded day is folded into hours (1 day + 1 hour = 25 hours).
+
 #### :except
 
 Don't want a measurement of time? No problem!
 
 ```ruby
 >> distance_of_time_in_words(Time.now, Time.now + 1.hour + 1.minute, false, except: :minutes)
-=> "1 hour"
+=> "1 hour and 60 seconds"
 ```
 
+The excluded minute is folded into seconds (1 minute = 60 seconds) rather than discarded.
+
 Culling a whole group of measurements of time:
 
 ```ruby
 >> distance_of_time_in_words(Time.now, Time.now + 1.hour + 1.day + 1.minute, false, except: [:minutes, :hours])
-=> "1 day"
+=> "1 day and 3660 seconds"
 ```
 
+The excluded hour and minute cascade down into seconds (1 hour + 1 minute = 3660 seconds).
+
 #### :highest\_measure\_only
 
+> **Deprecated**. Use `highest_measures: 1` instead.
+
 For times when Rails `distance_of_time_in_words` is not precise enough and `DOTIW` is too precise. For instance, if you only want to know the highest time part (measure) that elapsed between two dates.
 
 ```ruby
@@ -189,6 +239,24 @@ When you want variable precision from `DOTIW`:
 => "1 hour and 1 minute"
 ```
 
+You can also specify what to do with the extra time with the `remainder` option:
+
+```ruby
+>> distance_of_time_in_words(Time.now, Time.now + 1.hour + 1.minute + 1.second, true, highest_measures: { max: 2, remainder: :ceiling })
+=> "1 hour and 2 minutes"
+```
+
+Valid options for `remainder` are `:floor` (default), `:ceiling` and `:round`. Note that `:round` is best-effort and makes some simplifying assumptions:
+
+```ruby
+# Only the next-largest unit is examined, which can unexpectedly round down in some situations.
+>> distance_of_time_in_words(Time.now, Time.now + 1.week + 3.days + 23.hours, true, highest_measures: { remainder: :round })
+=> "1 week"
+# The variability of some measures (like months) is ignored and the shortest duration of that measure is used.
+>> distance_of_time_in_words(Time.now, Time.now + 1.month + 14.days, true, highest_measures: { remainder: :round })
+=> "2 months"
+```
+
 #### :words_connector
 
 This is an option for `to_sentence`, defaults to ', '.

data/RELEASING.md

@@ -0,0 +1,71 @@
+# Releasing DOTIW
+
+There are no hard rules about when to release dotiw. Release bug fixes frequently, features not so frequently and breaking API changes rarely.
+
+## Release
+
+Run tests, check that all tests succeed locally.
+
+```
+bundle install
+rake
+```
+
+Check that the last build succeeded in [GitHub Actions](https://github.com/radar/distance_of_time_in_words/actions) for all supported platforms.
+
+Add a date to this release in [CHANGELOG.md](CHANGELOG.md).
+
+```
+## 5.5.1 (2026/03/28)
+```
+
+Remove the line with "Your contribution here.", since there will be no more contributions to this release.
+
+Commit your changes.
+
+```
+git add CHANGELOG.md lib/dotiw/version.rb
+git commit -m "Preparing for release, 5.5.1."
+git push origin master
+```
+
+Release.
+
+```
+rake release
+```
+
+This builds the gem, creates and pushes a git tag, and pushes the gem to [RubyGems](https://rubygems.org/gems/dotiw).
+
+```
+dotiw 5.5.1 built to pkg/dotiw-5.5.1.gem.
+Tagged v5.5.1.
+Pushed git commits and tags.
+Pushed dotiw 5.5.1 to rubygems.org.
+```
+
+Create a GitHub release for the tag using the `gh` CLI, passing the CHANGELOG entries for this version as the release notes.
+
+```
+gh release create v5.5.1 --title "5.5.1" --notes "$(sed -n '/^## 5.5.1/,/^## /p' CHANGELOG.md | sed '$d')"
+```
+
+## Prepare for the Next Version
+
+Add the next release to [CHANGELOG.md](CHANGELOG.md).
+
+```
+## 5.5.2 (Next)
+
+* Your contribution here.
+```
+
+Increment the patch version number in [lib/dotiw/version.rb](lib/dotiw/version.rb).
+
+Commit your changes.
+
+```
+git add CHANGELOG.md lib/dotiw/version.rb
+git commit -m "Preparing for next developer iteration, 5.5.2."
+git push origin master
+```

data/benchmarks/distance_of_time_in_words_bench.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+# Benchmark for https://github.com/radar/distance_of_time_in_words/issues/79
+#
+# Compares dotiw's distance_of_time_in_words against Rails' original
+# ActionView::Helpers::DateHelper#distance_of_time_in_words, using the
+# scenario from the issue and its follow-up comments.
+#
+# Run with `ruby benchmarks/distance_of_time_in_words_bench.rb` after
+# `gem install benchmark-ips benchmark-memory actionview`.
+
+require 'active_support'
+require 'active_support/core_ext'
+require 'benchmark/ips'
+require 'benchmark/memory'
+
+require_relative '../lib/dotiw'
+
+begin
+  require 'action_view'
+rescue LoadError
+  warn "This benchmark requires actionview: gem install actionview"
+  exit 1
+end
+
+include ActionView::Helpers::DateHelper
+
+now = Time.now
+future_time = Time.now + 100.years + 30.days + 50.seconds
+
+%i[ips memory].each do |type|
+  Benchmark.public_send(type) do |x|
+    x.report('dotiw') { DOTIW.distance_of_time_in_words(now, future_time) }
+    x.report('rails') { distance_of_time_in_words(now, future_time, include_seconds: true) }
+
+    x.compare!
+  end
+end

data/dotiw.gemspec

@@ -26,7 +26,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'tzinfo', '~> 1.2.7'
+  s.add_development_dependency 'mutex_m'
+  s.add_development_dependency 'base64'
+  s.add_development_dependency 'bigdecimal'
+  s.add_development_dependency 'simplecov'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/gemfiles/{rails_4.gemfile → rails_7.0.gemfile}

@@ -4,6 +4,7 @@
 
 source 'http://rubygems.org'
 
-gem 'rails', '~> 4.0'
+gem 'rails', '~> 7.0.0'
+gem 'tzinfo', '~> 2.0'
 
 gemspec path: '../'

data/gemfiles/rails_7.1.gemfile

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source 'http://rubygems.org'
+
+gem 'rails', '~> 7.1.0'
+gem 'tzinfo', '~> 2.0'
+
+
+gemspec path: '../'

data/gemfiles/rails_7.2.gemfile

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source 'http://rubygems.org'
+
+gem 'rails', '~> 7.2.0'
+gem 'tzinfo', '~> 2.0'
+
+
+gemspec path: '../'

data/gemfiles/rails_8.0.gemfile

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source 'http://rubygems.org'
+
+gem 'rails', '~> 8.0.0'
+gem 'tzinfo', '~> 2.0'
+
+
+gemspec path: '../'

data/gemfiles/rails_8.1.gemfile

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source 'http://rubygems.org'
+
+gem 'rails', '~> 8.1.0'
+gem 'tzinfo', '~> 2.0'
+
+
+gemspec path: '../'

data/gemfiles/rails_8.1_i18n.gemfile

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source 'http://rubygems.org'
+
+gem 'rails', '~> 8.1.0'
+gem 'rails-i18n'
+gem 'tzinfo', '~> 2.0'
+
+gemspec path: '../'

data/lib/dotiw/core.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'i18n'
+require 'logger'
+require 'active_support'
+require 'active_support/core_ext'
+
+module DOTIW
+  extend ActiveSupport::Autoload
+
+  eager_autoload do
+    autoload :VERSION, 'dotiw/version'
+    autoload :TimeHash, 'dotiw/time_hash'
+    autoload :Methods, 'dotiw/methods'
+  end
+
+  extend self
+
+  DEFAULT_I18N_SCOPE = :'datetime.dotiw'
+  DEFAULT_I18N_SCOPE_COMPACT = :'datetime.dotiw_compact'
+
+  # DOTIW.distance_of_time_in_words(...), DOTIW.time_ago_in_words(...), etc.
+  extend Methods
+
+  def init_i18n!
+    I18n.load_path.unshift(*locale_files)
+    I18n.reload!
+  end
+
+  def languages
+    @languages ||= (locale_files.map { |path| path.split(%r{[/.]})[-2].to_sym })
+  end
+
+  def locale_files
+    files 'locale', '*.yml'
+  end
+
+  protected
+
+  def files(directory, ext)
+    Dir[File.join File.dirname(__FILE__), directory, ext]
+  end
+end
+
+DOTIW.init_i18n!

data/lib/dotiw/locale/dz.yml

@@ -0,0 +1,60 @@
+dz:
+  datetime:
+    dotiw:
+      seconds:
+        one: སྐར་ཆ་ ༡
+        other: "སྐར་ཆ་ %{count}"
+      minutes:
+        one: སྐར་མ་ ༡
+        other: "སྐར་མ་ %{count}"
+      hours:
+        one: ཆུ་ཚོད་ ༡
+        other: "ཆུ་ཚོད་ %{count}"
+      days:
+        one: ཉིནམ་ ༡
+        other: "ཉིནམ་ %{count}"
+      weeks:
+        one: བདུན༌ཕྲག་ ༡
+        other: "བདུན༌ཕྲག་ %{count}"
+      months:
+        one: ཟླཝ་ ༡
+        other: "ཟླཝ་ %{count}"
+      years:
+        one: ལོ་ ༡
+        other: "ལོ་ %{count}"
+      less_than_x: "%{distance} ་ལས་ཉུངམ་"
+    dotiw_compact:
+      seconds:
+        one: སྐར་ཆ་ ༡
+        other: "སྐར་ཆ་ %{count}"
+      minutes:
+        one: སྐར་མ་ ༡
+        other: "སྐར་མ་ %{count}"
+      hours:
+        one: ཆུ་ཚོད་ ༡
+        other: "ཆུ་ཚོད་ %{count}"
+      days:
+        one: ཉིནམ་ ༡
+        other: "ཉིནམ་ %{count}"
+      weeks:
+        one: བདུན༌ཕྲག་ ༡
+        other: "བདུན༌ཕྲག་ %{count}"
+      months:
+        one: ཟླཝ་ ༡
+        other: "ཟླཝ་ %{count}"
+      years:
+        one: ལོ་ ༡
+        other: "ལོ་ %{count}"
+      less_than_x: "%{distance} ་ལས་ཉུངམ"
+      words_connector: ""
+      two_words_connector: " དང་ "
+      last_word_connector: " དང་ "
+      about_x_years:
+        one: ལོ་ ༡ ་དེ་ཅིག
+        any: "ལོ་ %{count} ་དེ་ཅིག"
+      over_x_years:
+        one: "ལོ་ ༡ ་ལས་ལྷགཔ་ཅིག"
+        other: "ལོ་ %{count} ་ལས་ལྷགཔ་ཅིག"
+      almost_x_years:
+        one: ལོ་ ༡ ་མ་ལྷགཔ་ཅིག
+        any: "ལོ་ %{count} ་མ་ལྷགཔ་ཅིག"

data/lib/dotiw/locale/ru.yml

@@ -39,22 +39,22 @@ ru:
       less_than_x: "меньше, чем %{distance}"
     dotiw_compact:
       seconds:
-        one: 1с
+        one: "%{count}с"
         other: "%{count}с"
       minutes:
-        one: 1м
+        one: "%{count}м"
         other: "%{count}м"
       hours:
-        one: 1ч
+        one: "%{count}ч"
         other: "%{count}ч"
       days:
-        one: 1д
+        one: "%{count}д"
         other: "%{count}д"
       weeks:
-        one: 1н
+        one: "%{count}н"
         other: "%{count}н"
       months:
-        one: 1ме
+        one: "%{count}ме"
         other: "%{count}ме"
       years:
         one:   "%{count}г"
@@ -66,11 +66,11 @@ ru:
       two_words_connector: ""
       last_word_connector: ""
       about_x_years:
-        one: ~1г
+        one: "~%{count}г"
         any: "~%{count}г"
       over_x_years:
-        one: ">1г"
+        one: ">%{count}г"
         other: ">%{count}г"
       almost_x_years:
-        one: ~1г
+        one: "~%{count}г"
         any: "~%{count}г"