about summary refs log tree commit diff
path: root/config
AgeCommit message (Collapse)Author
2017-04-15Update devise.fr.yml (#1792)Olivier Humbert
* Update devise.fr.yml Consistencies across the French translation * Update doorkeeper.fr.yml
2017-04-15More Norwegian translations (#1805)Thor Harald Johansen
* Working translation for Norwegian. * Fixes to Norwegian translation. * Further adjustments to Norwegian translation. * Further adjustments to Norwegian translation. * Yet more improvements to the Norwegian translation. * More Norwegian translations. Better terminology.
2017-04-15Mispelling & minor fixes (#1814)Darío Hereñú
2017-04-15Remove unused will_paginate.page_gap key from i18n (#1815)Matt Jankowski
This value was changed recently, and every locale which had it set was using the same value as the default. This value is still the default in the new location.
2017-04-15Polish translation (needs more love though) (#807)rysiekpl
* Polish translation (needs more love though) * Polish translation bugfix * bugfix for new colon-containing texts * another bugfix. yaml is evil * minor fix * fixing issues pointed out by reviewers * Uwierzytelnianie dwustopniowe -> dwuetapowe, as suggested by a reviewer * Etyczny dizajn zbyt sarkastyczny, to będą założenia
2017-04-15Add REDIS_DB env variable to configure Redis database (#1366)Les Orchard
2017-04-15Allow running mastodon on a different domain as the one used for identifying ↵ThibG
users (#1267) * Allow running mastodon on a different domain as the one used for identifying users * Alter documentation of WEB_DOMAIN to make clear it shouldn't be used unless the admin knows what they are doing * Compare to web_domain instead of local_domain when dealing with feeds/API * Correctly identify mentions to local accounts Mentions URLs point to the person's web profile, i.e., the user page served on WEB_DOMAIN.
2017-04-15Custom Paperclip path. (#778)Valentin Lorentz
* Custom Paperclip path. * Document PAPERCLIP_ROOT. * Add PAPERCLIP_ROOT_URL (and rename PAPERCLIP_ROOT to PAPERCLIP_ROOT_PATH).
2017-04-14Add missing Japanese translations (#1785)Kazuhiro NISHIYAMA
2017-04-14Fix Japanese translation for remote_follow (#1771)Takayuki KUSANO
Current remote_follow.acct translation inappropriate. Users may input their own acccount. So fix the wording.
2017-04-14Admin reports controller improvements (#1714)Matt Jankowski
* Simplify admin/reports controller filtering for index * Rename parameter to resolved * Fix issue where reports view could not access filter_link_to * Add coverage for admin/reports controller * DRY up resolution of related reports for target account * Clean up admin/reports routes * Add Report#statuses method * DRY up current account action taken params * Rubocop styles
2017-04-14Modify ActionMailer configuration to default to ENV['LOCAL_DOMAIN'] if ↵Effy Elden
ENV['SMTP_DOMAIN'] is not set. The previous fallback, config.x.local_domain, is undefined when the code is called. (#1745)
2017-04-13Fix italian translationEugen Rochko
2017-04-13Merge branch 'master' of git://github.com/matteoaquila/mastodon into ↵Eugen Rochko
matteoaquila-master
2017-04-13Make browserify respect changes in node_modules for asset compilation (#1722)Eugen
2017-04-13Update devise.it.ymlMatteo Aquila
2017-04-13Update devise.it.ymlMatteo Aquila
2017-04-13Make boost modal off by default (#1719)Eugen
2017-04-13Add filename extension to paperclip (#1718)Yusuke Abe
2017-04-13Use english in reported by translation (#1713)Matt Jankowski
2017-04-13Fr missing strings (#1708)spf
* Fix missing translation for username already taken * fr - note too long translation
2017-04-13Translate admin (#1702)Thomas Citharel
* Translate the domain_block panel Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Translate PubSubHubbub section Signed-off-by: Thomas Citharel <tcit@tcit.fr> * translate account section and correct typos * move reports translation & translate sidebar Signed-off-by: Thomas Citharel <tcit@tcit.fr> * normalize l18n
2017-04-13smtp delivery type fix (#1556)James Moore
* delivery fix # Conflicts: # config/environments/production.rb * added stub in .env file * reordered and added a comment
2017-04-13Apply `i18n-tasks normalize` to locales (#1696)Eugen
2017-04-13Add Dutch translation (nl) (#1682)Koala Yeung
* Dutch language files for Ruby code * Created RoR translation ymls: * config/locales/devise.nl.yml * config/locales/doorkeeper.nl.yml * config/locales/nl.yml * config/locales/simple_form.nl.yml * Modified RoR config and helper * app/helpers/settings_helper.rb * config/application.rb * Dutch language javascript locale * Created javascript locale files: * app/assets/javascripts/components/locales/index.jsx * app/assets/javascripts/components/locales/nl.jsx * Reference the newly created locale files: * app/assets/javascripts/components/containers/mastodon.jsx * Fix syntax error in locale file (nl) * Fix missing translate in js locale (nl) * Convert all ruby Dutch locale (nl) file to utf8 Fix yml conversion issues. * Fix duplicated key in devise.nl.yml * Fix indentation error in doorkeeper.nl.yml
2017-04-13Update application.rbMatteo Aquila
2017-04-13Rename simple_form.it.yml to config/locales/simple_form.it.ymlMatteo Aquila
2017-04-13Rename devise.it.yml to config/locales/devise.it.ymlMatteo Aquila
2017-04-13Rename doorkeeper.it.yml to config/locales/doorkeeper.it.ymlMatteo Aquila
2017-04-13Rename it.yml to config/locales/it.ymlMatteo Aquila
2017-04-13[l10n] ja: update missing Japanese translations (#1684)Musee U
2017-04-13Adds Croatian language [Hrvatski] (#1000)May Kittens Devour Your Soul
* Create simple.form.hr.yml * Create hr.yml * Update hr.yml * Update hr.yml * Create doorkeeper.hr.yml * Create devise.hr.yml
2017-04-13Update Japanese translation files (#1640)新都心(Neet Shin)
* [l10n] ja: Improve Japanese Translations * ja: about: Fix highlighting * ja: Update Translations * ja: Translate admin settings Signed-off-by: lindwurm <lindwurm.q@gmail.com> * Update ja.jsx * Update doorkeeper.ja.yml * Update ja.yml * Update ja.jsx * Update ja.jsx
2017-04-13Update Russian translation (#1570)Ratmir Karabut
* Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency * Update Russian translation * Arrange Russian setting alphabetically * Fix syntax error
2017-04-13Fix #624 - Add localization for Bulgarian (#645)Svetlozar Todorov
* Add translation files and declarations for Bulgarian * Add a bunch of translations to bg.jsx * Add rest of translations to bg.jsx * Add devise translations * Fix devise translations
2017-04-13Clean up well-known routes/controllers (#1649)Matt Jankowski
* Add request spec for host meta route returning xml * Add routing spec for xrd routes * Update well-known routes * Move webfinger and host-meta actions to their own controllers
2017-04-13Admin accounts controller cleanup (#1664)Matt Jankowski
* Remove unused account_params method in admin/accounts controller * Introduce AccountFilter to find accounts * Use AccountFilter in admin/accounts controller * Use more restful routes admin silence and suspension area * Add admin/silences and admin/suspensions controllers
2017-04-13Adjustments to the Norwegian translation (#1648)Thor Harald Johansen
* Working translation for Norwegian. * Fixes to Norwegian translation. * Further adjustments to Norwegian translation. * Further adjustments to Norwegian translation.
2017-04-12[l10n] ja: Improve Japanese Translations (#1631)lindwurm
* ja: about: Fix highlighting * ja: Update Translations * ja: Translate admin settings Signed-off-by: lindwurm <lindwurm.q@gmail.com>
2017-04-12fix Japanese translation (#1623)pinfort
* add device.ja.yml * update device.ja.yml * add file simple_form.ja.yml * 👍Added doorkeeper.ja.yml * add ja.yml * Update doorkeeper.ja.yml fixed url to uri * update ja.yml * fix some translations * fix japanese grammar of a translate * fix some translates * fix ja.yml * add ja.jsx * add Japanese user mail views * Added japanese translate locales * Added :ja to available_locales こっちも * Added "日本語" to HUMAN_LOCALES * Imported/Added ja to addLocaleData * update ja.jsx * fix translations 翻訳の誤りの修正と改善 * freeの訳修正 * いいねをお気に入りに統一 * Revert "いいねをお気に入りに統一" This reverts commit 568d5cccfa0b6620ccb6c9db8346c52c0396d99f. 間違ってtranslateブランチにコミットしたため取り消し * Revert "freeの訳修正" This reverts commit 565658a60583ff7e1e7a63ef597bf3ac6118e1bf. * revertでミスったので戻す * Revert "ミスったので戻す" This reverts commit 00be7a748a6a2ae85a62be847172424278c52ec7, reversing changes made to b4e1e06503c77e079cb2569a53ab4d6fcfcfd116. * freeの訳修正 * いいねをお気に入りに統一 * 一回戻す * 戻しきれてなかった * 再度変更 * 戻す * 再度変更 * 再度変更 * Update doorkeeper.ja.yml Fixed a lot of unnatural translations * Update ja.yml 資格情報 isn't easy to understanding. so fixed to ログイン情報. * Update ja.yml fixed some unnatural translations * Update simple_form.ja.yml Fixed wrong translate 「アカウント」 to 「アイコン画像」 * Update simple_form.ja.yml * Update doorkeeper.ja.yml * Revert "多くの不自然な翻訳を解消しました。" * Update ja.jsx fixed typo * 文字化け修正
2017-04-12Fix incorrect notation in simple_form.ja.yml (#1620)Manato Kameya
2017-04-12Update fr.yml (#1600)CgX
Mistake on %{link} variable
2017-04-12Quick best practice cleanup of views/helpers (#1546)Matt Jankowski
* Remove trailing whitespace * Use query methods instead of explicit .blank? checks
2017-04-12Allow import/export of mutes list (#1541)Matt Jankowski
* Allow export of mutes list * Allow importing of mutes list * Refactor to use Settings::Exports::BaseController and DRY up exports code
2017-04-12Added missing Spanish translations strings (#1292)Carlos A. Escobar
* Added missing Spanish translations strings * fix bad translation * resolve conflict with tootsuite/master * agreements from spanish community * Add some missing strings
2017-04-12Make Reporting admin section translatable (#1549)Thomas Citharel
* Make Reporting admin section translatable And translate it into english and french Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Make subject of emails translatable and improve french translation Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Make error pages translatable and translate them in english and french Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Translate site setting section * Insert instance in registration emails and improve them a bit Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-04-12Working translation for Norwegian. (#1611)Thor Harald Johansen
2017-04-12Default to json type for webfinger requests (#1583)Matt Jankowski
2017-04-12Add Traditional Chinese, Hong Kong translation (zh-HK) (#1544)Koala Yeung
* Added Chinese Traditional Hong Kong (zh-HK) for Ruby * Added translations for Ruby. * Added Chinese Traditional Hong Kong (zh-HK) for JS * Added translations for javascript code. * Rearrange language references in mastodon.jsx * Break `addLocaleData` into multiple lines. Make future commit more readable. * Roughly re-sort the languages in alphabetical orders (only manually put English on top because it is default). * Sort application.rb locale with alphabetical order With exception that English (default language) goes first. Improve code readability. * Resort language selection box alphabetically Sort HUMAN_LOCALES in the alphabetical order of display name (except English, the default language, come first). Improve usability.
2017-04-11Change default log level in production from :debug to :info for less I/O (#1579)Eugen
generated by cgit-pink (git 2.37.1) at 2024-11-09 04:51:01 +0000