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.

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

chore: consolidate repeat-use i18n keys #1604

Merged
merged 16 commits into from
Sep 4, 2020
Merged

Conversation

jessicaschilling
Copy link
Contributor

@jessicaschilling jessicaschilling commented Aug 29, 2020

Summary

This PR moves repeat-use i18n keys into app.json, explicitly references that namespace as needed in the appropriate files, and cleans up a few related details. This work enables more of a standardized, taxonomy-style approach as we continue to enhance functionality in Web UI overall.

Closes #1600.

Details

The app.json file now includes i18n key categories for repeat-use items:

  • actions (things that are likely to appear on buttons and similar):
    • add
    • browse
    • cancel
    • change
    • clear
    • close
    • copy
    • create
    • delete
    • download
    • edit
    • import
    • more
    • moreInfo
    • noThanks
    • OK
    • pinVerb (to distinguish between that and terms.pinNoun when languages differ)
    • rename
    • reset
    • save
    • saving
    • selectAll
    • submit
    • unpin
    • unselectAll
  • nav (things that appear in navigation furniture):
    • bugsLink
    • codeLink
    • revision
  • status (repeat-instance global status messages):
    • connectedToIpfs
    • connectingToIpfs
    • couldNotConnect
  • terms (either IPFS terms of art, or extremely common words in the Web UI context):
    • address
    • addresses
    • advanced
    • agent
    • api
    • apiAddress
    • blocks
    • connection
    • downSpeed
    • example
    • file
    • files
    • folder
    • folders
    • gateway
    • in
    • latency
    • location
    • name
    • node
    • out
    • peer
    • peerId
    • peers
    • pinNoun (to distinguish between that and actions.pinVerb when languages differ)
    • pins
    • publicKey
    • rateIn
    • rateOut
    • repo
    • size
    • totalIn
    • totalOut
    • unknown
    • upSpeed
  • tour (previously existed, but didn't contain complete list of keys):
    • back
    • close
    • finish
    • next
    • skip
    • tooltip

@jessicaschilling
Copy link
Contributor Author

@lidel and @rafaelramalho19 -- I'd appreciate a review at your leisure. This isn't terribly urgent work, but wanted to get this PR in sooner rather than later to avoid merge conflicts. Thank you!

@jessicaschilling jessicaschilling added this to the v2.11 milestone Sep 1, 2020
@lidel
Copy link
Member

lidel commented Sep 1, 2020

note to self: enable preload of en locale to avoid raw keys to show on initial load when webui is not on local node

Actions: add, edit, reset, saving
Status: connectedToIpfs, couldNotConnect
Terms: address, addresses, advanced, agent, connection, downSpeed, example, gateway, latency, location, rateIn, rateOut, size, totalIn, totalOut, unknown, upSpeed
Actions: OK, browse, clear, create, noThanks, download, more, moreInfo, pinVerb, rename, unpin, selectAll, unselectAll
Status: connectingToIpfs
Terms: blocks, file, files, folder, folders, publicKey, node, pinNoun, name, pins, repo
@jessicaschilling
Copy link
Contributor Author

Rebased from master to account for this morning's merges, and cleaned up two additional duplicate keys. @lidel and @rafaelramalho19, this is ready for your review - thank you!

Copy link
Member

@lidel lidel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, let's merge this sooner than later.

@lidel lidel changed the title chore: Consolidate repeat-use i18n keys chore: consolidate repeat-use i18n keys Sep 4, 2020
@lidel lidel merged commit 35dae18 into master Sep 4, 2020
@lidel lidel deleted the chore/consolidate-common-i18n branch September 4, 2020 23:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Consolidate repeat-use i18n keys
2 participants