about summary refs log tree commit diff
path: root/config/locales/activerecord.zh-HK.yml
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2020-04-05 18:32:06 +0200
committerThibaut Girka <thib@sitedethib.com>2020-04-05 18:32:06 +0200
commit9101254d0a70bc6f899c093f33300cffceb7c8ac (patch)
treec8e9e95a36ffb2346e3168d00364e4b614bee92a /config/locales/activerecord.zh-HK.yml
parent6e426267a762f3cd1efa2c5fb120a13543567775 (diff)
parent85f0e0a606905ecda1322a0f7b65d8b4ff91dd69 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/packs/public.js`:
  Upstream modified code that we split between multiple files due
  to glitch-soc's theming system.
  Ported those changes.
Diffstat (limited to 'config/locales/activerecord.zh-HK.yml')
-rw-r--r--config/locales/activerecord.zh-HK.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/locales/activerecord.zh-HK.yml b/config/locales/activerecord.zh-HK.yml
index 2ebf9586c..c968e55aa 100644
--- a/config/locales/activerecord.zh-HK.yml
+++ b/config/locales/activerecord.zh-HK.yml
@@ -1,6 +1,10 @@
 ---
 zh-HK:
   activerecord:
+    attributes:
+      poll:
+        expires_at: 截止時間
+        options: 選擇
     errors:
       models:
         account: