Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Translate CW, poll options and media descriptions #24175

Merged
merged 25 commits into from
May 31, 2023
Merged

Translate CW, poll options and media descriptions #24175

merged 25 commits into from
May 31, 2023

Commits on Mar 18, 2023

  1. Translate everything

    @c960657
    c960657 committed Mar 18, 2023
    Configuration menu
    Copy the full SHA
    ab87008 View commit details
    Browse the repository at this point in the history

  2. Translate spoiler text and poll options

    @c960657
    c960657 committed Mar 18, 2023
    Configuration menu
    Copy the full SHA
    2df1569 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2023

  1. Translate media attachment descriptions

    @c960657
    c960657 committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    3f957aa View commit details
    Browse the repository at this point in the history

  2. Fix caching

    @c960657
    c960657 committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    316429e View commit details
    Browse the repository at this point in the history

  3. Adjust language variable naming

    @c960657
    c960657 committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    76c15c3 View commit details
    Browse the repository at this point in the history

  4. Show translate button even if only CW is visible

    @c960657
    c960657 committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    96192d3 View commit details
    Browse the repository at this point in the history

  5. Adjust language variable naming

    @c960657
    c960657 committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    c6c7737 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2023

  1. Translate aria-label

    @c960657
    c960657 committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    7136bb4 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2023

  1. Namespace cache key 

    Co-authored-by: Claire <claire.github-309c@sitedethib.com>
    @c960657 @ClearlyClaire
    c960657 and ClearlyClaire committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    2ef7201 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2023

  1. Do not use translation as boolean

    @c960657
    c960657 committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    47b5c44 View commit details
    Browse the repository at this point in the history

  2. Revert changes to account gallery view

    @c960657
    c960657 committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    d89cab4 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2023

  1. Merge branch 'main' into translate-everything

    @c960657
    c960657 committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    aab0463 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2023

  1. Merge remote-tracking branch 'upstream/main' into translate-everything 

    # Conflicts:
#	app/javascript/mastodon/components/status_content.jsx
    @c960657
    c960657 committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    fd13362 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2023

  1. Merge remote-tracking branch 'upstream/main' into translate-everything 

    # Conflicts:
#	app/javascript/mastodon/features/ui/components/media_modal.jsx
    @c960657
    c960657 committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    8b783a3 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2023

  1. Allow translating statuses with empty content

    @c960657
    c960657 committed Apr 23, 2023
    Configuration menu
    Copy the full SHA
    bc53212 View commit details
    Browse the repository at this point in the history

  2. Return empty string for spoiler_warning

    @c960657
    c960657 committed Apr 23, 2023
    Configuration menu
    Copy the full SHA
    e3788d7 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2023

  1. Merge branch 'main' into translate-everything 

    # Conflicts:
#	app/javascript/mastodon/components/media_gallery.jsx
#	app/javascript/mastodon/components/status.jsx
    @c960657
    c960657 committed May 2, 2023
    Configuration menu
    Copy the full SHA
    40b0eb9 View commit details
    Browse the repository at this point in the history

  2. Rename StatusTranslation to Translation

    @c960657
    c960657 committed May 2, 2023
    Configuration menu
    Copy the full SHA
    723d340 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2023

  1. Use translate=no for round-tripping custom emojis

    @c960657
    c960657 committed May 3, 2023
    Configuration menu
    Copy the full SHA
    80d8f5f View commit details
    Browse the repository at this point in the history

  2. Test that other span attributes are preserved

    @c960657
    c960657 committed May 3, 2023
    Configuration menu
    Copy the full SHA
    2bece47 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2023

  1. HTML handling

    @c960657
    c960657 committed May 10, 2023
    Configuration menu
    Copy the full SHA
    d358dec View commit details
    Browse the repository at this point in the history

  2. Document new option

    @c960657
    c960657 committed May 10, 2023
    Configuration menu
    Copy the full SHA
    cd7642d View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/main' into translate-everything

    @c960657
    c960657 committed May 10, 2023
    Configuration menu
    Copy the full SHA
    d0ec484 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2023

  1. Merge remote-tracking branch 'upstream/main' into translate-everything 

    # Conflicts:
#	app/javascript/mastodon/features/ui/components/media_modal.jsx
    @c960657
    c960657 committed May 12, 2023
    Configuration menu
    Copy the full SHA
    238dc6c View commit details
    Browse the repository at this point in the history

Commits on May 23, 2023

  1. Merge remote-tracking branch 'upstream/main' into translate-everything 

    # Conflicts:
#	app/javascript/mastodon/reducers/polls.js
#	app/javascript/mastodon/reducers/statuses.js
    @c960657
    c960657 committed May 23, 2023
    Configuration menu
    Copy the full SHA
    0b65bc4 View commit details
    Browse the repository at this point in the history