Fix ambiguous UploadField labels

[jonom]

‘Browse’ could mean your computer or the CMS File store. Likewise for ‘Add from files’, particularly since the word ‘Add’ implies a new file is being introduced to the system rather than a previous upload being reused. Fixes #765

@robbieaverill I did yarn install and yarn build in the root and got a ton of error messages. Is there a trick here? Or do builds happen somewhere else?

[ScopeyNZ]

As long as you yarn;yarn build from the root of asset-admin it should work. Ensure you're using the right version of node - nvm (node version manager) is your friend for this. For the 1 branch the version of node required is 10.

cc @silverstripeux

[jonom]

Thanks @ScopeyNZ - is this standard for all SS react projects? Is it documented somewhere and could we link to it from the contributing section of the ReadMe?

[ScopeyNZ]

Hit the wrong button sorry

This is standard for SS projects, and any npm/yarn project. We try to help out by specifying the node version required in package.json and .nvmrc. In saying that - our docs could always do with updating to help understanding for this 😅

[jonom]

Thanks @ScopeyNZ, I installed nvm and switched to v10, still bombed. Here's a sample:

gyp ERR! configure error
gyp ERR! stack Error: `gyp` failed with exit code: 1
gyp ERR! stack     at ChildProcess.onCpExit ([redacted]/asset-admin/node_modules/node-sass/node_modules/node-gyp/lib/configure.js:336:16)
gyp ERR! stack     at ChildProcess.emit (events.js:198:13)
gyp ERR! stack     at Process.ChildProcess._handle.onexit (internal/child_process.js:248:12)
gyp ERR! System Darwin 18.6.0
gyp ERR! command "[redacted]/.nvm/versions/node/v10.16.0/bin/node" "[redacted]asset-admin/node_modules/node-sass/node_modules/node-gyp/bin/node-gyp.js" "rebuild" "--verbose" "--libsass_ext=" "--libsass_cflags=" "--libsass_ldflags=" "--libsass_library="
gyp ERR! cwd [redacted]asset-admin/node_modules/node-sass
gyp ERR! node -v v10.16.0
gyp ERR! node-gyp -v v3.6.2

Any chance you could do the build, if you're happy with this change?

[ScopeyNZ]

Yep sure. We can do the build for you. I'll wait for some feedback from the UX team and @robbieaverill for the translation tag usage - he might not want the tags changed so that we don't lose translation coverage.

[jonom]

he might not want the tags changed so that we don't lose translation coverage.

Sure. I was inclined to use the existing tags for that same reason but @robbieaverill and @maxime-rainville thought it was probably safer to use new ones.

[jonom]

We can do the build for you

Thanks!

[maxime-rainville]

I've rebuilt the client lib which should make the travis green.

[robbieaverill]

Behat failure is pre-existing 😢

[jonom]

Thanks for the build and merge 👍