about summary refs log tree commit diff
path: root/config/locales/activerecord.hu.yml
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-06-19 16:19:32 +0200
committerThibaut Girka <thib@sitedethib.com>2019-06-19 18:36:16 +0200
commit356e9150dfec5bbb8a56b128c1d3372cd5731ec6 (patch)
treeb5270b3fe3c38ef2d94670f06613c4bdf71d0631 /config/locales/activerecord.hu.yml
parentf4b008906dcfc3333ec533884aa10b65f8ae41a2 (diff)
parentede0be5dba6836606db772a007ad9be5d60c7b99 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/lib/sanitize_config.rb
  Keep our version, we support the tags upstream transforms.
- package.json
- yarn.lock
Diffstat (limited to 'config/locales/activerecord.hu.yml')
-rw-r--r--config/locales/activerecord.hu.yml12
1 files changed, 12 insertions, 0 deletions
diff --git a/config/locales/activerecord.hu.yml b/config/locales/activerecord.hu.yml
index 52314c50c..bbc18bc33 100644
--- a/config/locales/activerecord.hu.yml
+++ b/config/locales/activerecord.hu.yml
@@ -1 +1,13 @@
+---
 hu:
+  activerecord:
+    attributes:
+      poll:
+        expires_at: Határidő
+        options: Lehetőségek
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: csak betűk, számok vagy alávonás