Commit graph

45 commits

Author SHA1 Message Date
yheuhtozr
cdedbc1588
views/notifications i18n (#15056)
* views/notifications etc i18n

* notifications PR fixes

* remove ja.yml

* Update en.yml

* Update fr.yml

* Update en.yml

* Update fr.yml

* Update _comment.html.erb

* Update _comment.html.erb

* Update notifications_helper.rb

* Update notifications_helper.rb

* Update notifications_helper.rb

* Update notifications_helper.rb

Co-authored-by: Michael Kohl <citizen428@forem.com>
2021-10-25 15:46:46 +07:00
Julianna Tetreault
a69a97b023
✂️✂️ Remove Extra Space From en.yml and fr.yml Files ✂️✂️ (#15149)
* Removes extra space from views/manager/fr.yml and en.yml

* Removes further spaces from views/manager/fr.yml and en.yml
2021-10-21 08:28:26 -06:00
yheuhtozr
e826fabf18
views/liquids i18n (#15060)
* views/liquids i18n

* PR key name changes

* remove ja.yml
2021-10-21 12:25:30 +07:00
yheuhtozr
7eea2b6a22
article editor and manager i18n (#15070)
* article editor, manager i18n

* PR key name changes

* remove ja.yml
2021-10-21 08:18:48 +07:00
Daniel Uber
f5a65c5f0c
Update i18n read_path to match our current localization file layout (#15140)
* Update read path to match our current file layout

The files specified under "more files" were expecting to be
named *.{locale}.yml, like misc.en.yml or tags.fr.yml. However, our
project layout is using a directory prefix like misc/en.yml or
tags/fr.yml.

Consequently, the locale files for views were not being tested (a
previous update ensured that they were being loaded).

Change the load pattern to match the files we use in the app, and
ensure they're tested.

This introduces test failures which will be addressed in the next commit.

* Add back the original pattern

This matches files like devise.en.yml and other existing files in
config/locales (not already in a subdirectory).

* Update inconsistent interpolation

The english version had `{community}` while the french version had
`{name}` for the videos.heading key, checking the call site at
https://github.com/forem/forem/blob/main/app/views/videos/index.html.erb#L26
we have `community:`, passed for interpolation to the translate call,
so change the french translations to include that, rather than name

* Update missing pluralization for badges

* make travis happy
2021-10-20 12:50:22 -05:00
yheuhtozr
cdb823bdf9
views/moderations i18n (#15068)
* views/moderations i18n

* PR key name changes

* remove ja.yml
2021-10-20 10:48:14 -05:00
yheuhtozr
8b87086200
views/badges etc i18n (#15021)
* views/badges etc i18n

* reformat for PR

* remove ja.yml

* PR argument error fix?
2021-10-20 09:36:30 -06:00
yheuhtozr
7504a243fd
views/tags etc i18n (#15039)
* views/tags etc i18n

* remove ja.yml

* YAML reformatting
2021-10-20 08:13:51 -06:00
yheuhtozr
3e009e3e8b
views/reading_list_items i18n (#15041)
* views/reading_list_items i18n

* remove ja.yml

* reading list items PR typo fix
2021-10-18 11:32:57 -07:00
yheuhtozr
d80f451c95
views/collections i18n (#15019)
* views/collections i18n

* reformat for PR

* remove ja.yml
2021-10-18 14:10:32 +07:00
Ben Halpern
09fa66a03f
Fix and clean up podcast pages (#15004)
* Fix and clean up podcast pages

* Adjust tests

* Fix a test

* Fix missing i18n

* Fix tests

* Fix tests

* Fiddle with test

* Sure up css and tests

* Add featured as allowed param

* Fix a couple tests

* xit out test

* Update app/views/podcast_episodes/index.html.erb

* Update app/views/podcast_episodes/index.html.erb

Co-authored-by: ludwiczakpawel <ludwiczakpawel@gmail.com>

Co-authored-by: ludwiczakpawel <ludwiczakpawel@gmail.com>
2021-10-15 17:38:57 -04:00
rhymes
abf7cf0bbd
Cleanup notifications nav menu markup (#15043)
* Use core keys instead of pluralize

* Cleanup markup and paths

* Add missing key

* Update app/views/notifications/_nav_menu.html.erb

Co-authored-by: Michael Kohl <citizen428@forem.com>

* Use regexps everywhere

* Update app/views/notifications/_nav_menu.html.erb

Co-authored-by: Arit Amana <32520970+msarit@users.noreply.github.com>

Co-authored-by: Michael Kohl <citizen428@forem.com>
Co-authored-by: Arit Amana <32520970+msarit@users.noreply.github.com>
2021-10-15 18:47:39 +02:00
yheuhtozr
56ee3c571f
various small article elements i18n (#15023) 2021-10-15 11:06:44 +07:00
yheuhtozr
44bddb5a94
views/videos i18n (#15022)
* views/videos i18n

* remove ja.yml
2021-10-14 16:08:11 -06:00
Michael Kohl
19280c08de
Normalize I18n files (#15079) 2021-10-14 20:54:04 +07:00
Krystal Austin
49e1434a8c
I18nize nav_menu's list items (#15055)
* I18nize nav_menu's list items

* reverted changes to admin list item in attempt to pass the one failed test in Travis CI

* Update reading_list value

Co-authored-by: Michael Kohl <citizen428@forem.com>
2021-10-14 11:22:03 +07:00
yheuhtozr
9faf136db1
views/onboardings i18n (#15018)
* views/onboardings i18n

* reformat for PR

* remove ja.yml
2021-10-13 12:26:07 +02:00
Michael Kohl
ee0bf55085
Add I18n pluralization format example (#15027) 2021-10-13 11:13:54 +07:00
Ben Halpern
ebc2961920
Translate pinned (#15008)
* Translate pinned

* Add pinned
2021-10-12 08:24:29 -04:00
VictorPS
39a62c4b3d
Internationalize hardcoded text for videos pages (#14960)
* Translation for "on Video"

* Moving dashboard.loading to core.loading to keep code DRY

* Translations for views/videos/new.html.erb

* Reverting the changes on app/views/dashboards/_sublist.html.erb

* Adding the dashboard.loading translations back

* Fixing some merge conflicts + sorting the dashboard translations

* Fixing the contact text on views/videos/new

* Using the full path instead of the lazy load
2021-10-12 12:09:55 +07:00
Tayllan
75df8e1f9e
Translate some labels from profile information (#15002)
* Translate some labels from profle information

* Fix some fr translations
2021-10-11 09:41:11 -04:00
Michael Kohl
e3abee660a
Add I18n date format example (#14973) 2021-10-08 15:08:56 -04:00
Bervianto Leo Pratama
acbda16b8a
Translate some texts from Dashboard Page (#14963)
* Extract some text from dashboard

* Fix template code

Signed-off-by: Bervianto Leo Pratama <bervianto.leo@gmail.com>

* Update translation for upload_a_video

* Fix wrong link

* Fix missing keys

* Seperate plural posts & followers
2021-10-08 13:55:21 +02:00
Lewis Sparlin
30b36ab014
I18n copy on Tags index page (#14891)
* Move hard-coded Tags index copy to [en,fr] locale files

* Use tags.pluralize for a better page title implementation

* Add better french translations

* Once more fr translation fix

* Remove .pluralize from title i18n
2021-10-08 10:21:06 +07:00
Krystal Austin
5b251a7bb7
I18nize main_nav's "Home" (#14982) 2021-10-07 16:36:50 -04:00
Ben Halpern
1d62d30853
Consolidate and internationalize various 'contact us' prompts (#14951)
* Consolidate and internationalize various 'contact us' prompts

* Update spec/requests/user/user_settings_spec.rb

Co-authored-by: Michael Kohl <citizen428@forem.com>

Co-authored-by: Michael Kohl <citizen428@forem.com>
2021-10-07 12:05:21 -04:00
Tayllan
fc77376c1b
Translate actions in articles view (#14911)
* Translate actions in articles view

* Move reactions to core.reactions namespace

* Add quotes to share_to in yml file

* Fix wrong translation in english locale

Co-authored-by: rhymes <github@rhymes.dev>
2021-10-07 12:08:14 +07:00
Monica Mateiu
bd0b4f1117
Tokenize settings menu and add French translations (#14905)
* tokenize settings menu and add French translations

* add quotes around tokens

* add tokens in alphabetical order

Co-authored-by: Ben Halpern <bendhalpern@gmail.com>
2021-10-06 17:53:58 +02:00
rhymes
eba0ddb240
Misc i18n fixes (#14852)
* Add i18n tasks spec

* Ignore storybook static folder

* Run i18n-tasks normalize

* Fix inconsistent interpolations flagged by i18n-tasks check-consistent-interpolations

* Update devise en translation and add devise_invitable fr translation

* Add missing keys, ignore those to be translated and normalize

* Temporarily ignore unused keys until we have a strategy for maintenance

* Add missing key

* Re-run normalize

* Disable normalize test temporarily
2021-10-05 13:22:33 +02:00
Monica Mateiu
322f7f4b16
Translate Following users page and loading text in sublist (#14898)
Co-authored-by: Ben Halpern <bendhalpern@gmail.com>
2021-10-05 12:44:07 +07:00
Thomas Bnt
685a069d79
Update some words already translated (#14890)
* Update some words already translated

* Edit log_in and see_all in french

* Update config/locales/fr.yml

Co-authored-by: Aurelie Verrot <aurelie+github@verrot.fr>

* Update fr.yml

Co-authored-by: Aurelie Verrot <aurelie+github@verrot.fr>
2021-10-04 17:18:30 -04:00
Ben Halpern
79a537b62d
Translate notification filters (#14884) 2021-10-01 16:18:07 -04:00
Ben Halpern
036d75aa6e
Admin-configurable display locale (#14620)
* Admin-configurable display locale

* Add i18n-js and namespacing

* Basic tests and clean up

* A few test adjustments

* Update vendor cache

* Fix a few tests

* Fix a few tests

* Update app/views/articles/_actions.html.erb

Co-authored-by: Michael Kohl <citizen428@dev.to>

* Update app/views/articles/_comments_actions.html.erb

Co-authored-by: Michael Kohl <citizen428@dev.to>

* Update app/views/articles/_single_story.html.erb

Co-authored-by: Michael Kohl <citizen428@dev.to>

* Update app/views/articles/_single_story.html.erb

Co-authored-by: Michael Kohl <citizen428@dev.to>

* Update app/views/comments/_comment_header.html.erb

Co-authored-by: Michael Kohl <citizen428@dev.to>

* Update app/views/layouts/_sidebar_tags.html.erb

Co-authored-by: Michael Kohl <citizen428@dev.to>

* Update app/views/listings/index.html.erb

Co-authored-by: Michael Kohl <citizen428@dev.to>

* Update spec/system/homepage/user_visits_homepage_articles_spec.rb

Co-authored-by: Michael Kohl <citizen428@dev.to>

* Update spec/system/user/view_user_index_spec.rb

Co-authored-by: Michael Kohl <citizen428@dev.to>

* Alphabetical locale page

* Add activerecord custom validation error translations

* Add i18n to webpacker

* Fix a few tests

* Adjust error messages

* Add i18n-tasks

* Adjust JS to get working with jest

* Adjust the way translations are pulled in

* Adjust jest tests

* Remove time localization

* Remove superfluous public js

* Add basic tests for i18n application controller

* Remove unnecessary content

Co-authored-by: Michael Kohl <citizen428@dev.to>
2021-09-28 11:04:35 -04:00
rhymes
b6360fb80c
Upgrade Rails to 6.1.3.1 (#11333)
* Upgrade Rails to 6.1

* Switch to unreleased bullet

* Run rails app:update

* Add deprecation notices after reading changelogs

* Fix app:update error

* Move middleware in the correct place

* Temporarily disable ransack which does not support Rails 6.1

* Remove wrongly merged file

* Re-run spring binstub

* Fix double quotes

* Track ransack branch with Rails 6.1 support

* Fix deprecation

* Switch to Ransack 2.4 which supports Rails 6.1 rc1

* Fix missing default params for the duration substitution

* Fix new behavior of relation.pluck with contradictory queries

* Fix uploaders specs by tracking rspec-rails main repo

* Disable bullet temporarily

* Fix remaining fixture_file_upload usages

* Add default seconds for video article duration

* Trigger Travis CI

* Upgrade Rails to 6.1.0.rc2

* Remove file deleted on master

* Add Rails 6.1 gem to Gemfile

* Trigger Travis CI

* Revert "Disable bullet temporarily"

This reverts commit cee0c2ce61fb72cbc16d52c94b12ee681e873031.

* Fix bullet version

* Upgrade to acts-as-taggable 7 and fix conflict

* Update Gemfile and rspec-* gems

* Fix nokogiri in Gemfile.lock

* Switch to rspec-rails main branch

* Remove leftover vendored cached items

* Fix path for Rails 6.1

* Use latest release of erb_lint

* Re-run rails app:update to incorporate new changes

* Disable erb_lint's ErbSafety checks

* Fix Gemfile.lock and re-add platform specific gems of Nokogiri

* Add mini_portile2 as well

* Fix latest merge conflict by removing now unused faraday_middleware

* Upgrade to Rails 6.1.3.1

* Regenerate Gemfile.lock and vendor/cache

* Add x86_64 linux gem

* Mark spec as flaky

* Revert "Mark spec as flaky"

This reverts commit 3caba94b33645f9b59c84ba78ee8df042fc7aee0.

Co-authored-by: Mac Siri <krairit.siri@gmail.com>
2021-04-05 10:39:48 -04:00
dependabot[bot]
fcce38fb7a
Bump carrierwave from 2.1.1 to 2.2.0 (#12802)
* Bump carrierwave from 2.1.1 to 2.2.0

Bumps [carrierwave](https://github.com/carrierwaveuploader/carrierwave) from 2.1.1 to 2.2.0.
- [Release notes](https://github.com/carrierwaveuploader/carrierwave/releases)
- [Changelog](https://github.com/carrierwaveuploader/carrierwave/blob/master/CHANGELOG.md)
- [Commits](https://github.com/carrierwaveuploader/carrierwave/compare/v2.1.1...v2.2.0)

Signed-off-by: dependabot[bot] <support@github.com>

* Replace extension_whitelist with extension_allowlist

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: rhymes <rhymes@hey.com>
2021-02-25 10:53:25 +01:00
dependabot[bot]
a464f961f3
Bump doorkeeper from 5.4.0 to 5.5.0 (#12742)
* Bump doorkeeper from 5.4.0 to 5.5.0

Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.4.0 to 5.5.0.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases)
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/main/CHANGELOG.md)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.4.0...v5.5.0)

Signed-off-by: dependabot[bot] <support@github.com>

* Update configuration and i18n strings

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: rhymes <rhymes@hey.com>
2021-02-19 17:49:18 +01:00
Ben Halpern
da6a6739e5
[deploy] Invite users to join and create password (#9294)
* Initial invitation work

* Add more invitation code

* Add proper registration page

* Fix up tests

* Fix failings

* Fix spec

* Add self-serve auth config

* Add registered condition

* Change profile image call and registered_at test

* Change comment

* Fix copy test

* Stub emojipedia

* Linting

* Add registered at to factory

* Ensure registered for user tag

* Update app/views/internal/invitations/index.html.erb

Co-authored-by: Michael Kohl <citizen428@dev.to>

* Update app/controllers/internal/invitations_controller.rb

Co-authored-by: Michael Kohl <citizen428@dev.to>

* Slight changes

* Update recover password flow

* Update app/views/internal/invitations/index.html.erb

Co-authored-by: Michael Kohl <citizen428@dev.to>

* Update app/controllers/internal/invitations_controller.rb

Co-authored-by: Michael Kohl <citizen428@dev.to>

* Update db/schema.rb

Co-authored-by: Michael Kohl <citizen428@dev.to>
2020-07-15 11:37:19 -04:00
Mac Siri
321b24d2a0
[deploy] Create write_articles oauth scope (#7834) 2020-05-14 09:55:53 -04:00
rhymes
e4b0331184 Update initializer and locales to doorkeeper 5.2.2 (#5004) 2019-12-04 11:44:46 -05:00
Anna Buianova
fd1b9868a2 Destroy webhook endpoints when user revokes oaurh app access (#4099)
* Destroy webhook endpoints when user revokes oaurh app access

* Make webhooks destroy on revoke asynchronous
2019-09-26 06:23:38 -04:00
Anna Buianova
9778ada44a Doorkeeper default scope (#4066)
* Start with the doorkeeper scopes

* Added read_articles scope

* Proper doorkeeper authorization for the API articles#me
2019-09-24 11:11:12 -07:00
Mac Siri
3071ac8c76 Implement Doorkeeper gem (#3504)
* Add doorkeeper gem

* Generate files with Doorkeeper's generator

* Create Doorkeeper tables

* Add new associations to User

* Update associations

* Remove confusing schemas

* Change oauth2_provider name
2019-07-31 10:30:58 -04:00
Anna Buianova
3d81753285 Rescue possible SSLError when fetching a podcast (#3374) 2019-07-03 10:36:36 -04:00
Anna Buianova
d6a151703c Podcasts reachable status #2952 (#3341)
* Podcasts reachable status #2952

* Specs for podcasts statuses
2019-07-02 09:18:27 -04:00
Mac Siri
301c6080e3 Initial commit 2018-02-28 16:11:08 -05:00