Merge branch 'release/v0.6.0-rc1'

.github/CONTRIBUTING.md

@@ -24,6 +24,31 @@ npm install
 
 Once they are installed, you should be able to then use the debugger/launcher within VS Code to launch and test an instance of Push.
 
+## Contributing language files
+
+Language files are a combination of ISO 639-1 language codes and ISO 3166-1 Alpha-2 codes of country codes. Country code is optional if a language does not require that definition, e.g. 'ja' (Japanese) vs 'en_gb' (British English).
+
+The following steps will get you started translating Push:
+
+1. Create a local fork of Push and clone it.
+2. Set it up for development within VS Code, using the instructions above.
+3. Duplicate `src/lang/en_gb.js` to `src/lang/your-language-code.js` (using the reference from ISO 639-1/ISO 3166-1) and make text changes as needed.
+4. Test using the vs code debugger "Launch extension" launch config.
+5. Open a project or workspace in the test window, then set your Push preferences `njpPush.locale` to `fr`. Anything that can be localised should now be using your `fr.js` for strings.
+
+There are replacement variables throughout the strings which are replaced with real values during runtime:
+
+ - `${1-9}`: Reference numbered arguments within `i18n.t`, etc
+ - `p{1-9:(singular):(plural)}`: Is a pluralise replacement. If the `1-9` argument is `1`, the `(singular)` is used, otherwise the `(plural)` is used.
+
+**Things to note**
+
+ - The language is of course quite technical. Keep this in mind when translating to native terms.
+ - "Push" should remain verbatim. It's a brand, and should be recognisable in any language.
+ - Try to be consistent with the existing letter casing. If a string is in title case, keep it in title case — unless the language itself overrides this requirement (such as languages with no uppercase letters).
+ - Try to maintain any punctuation defined, such as parentheses, full stops, commas etc.
+ - Most of the strings support flexible lengths, but try not to exceed the length of any string to an extreme degree. If the native terms feel too long compared to the english version, consider truncating them.
+
 ## Contributing changes
 
 There are a few points to be aware of before working on Push:

.vscode/launch.json

@@ -12,8 +12,9 @@
             ],
             "stopOnEntry": false,
             "skipFiles": [
-                "${workspaceRoot}/node_modules/**/*.js",
-                "<node_internals>/**/*.js"
+                "${workspaceRoot}/node_modules/**/*",
+                "/Applications/Visual Studio Code.app/Contents/Resources/app/extensions/**/*",
+                "<node_internals>/**/*"
             ]
         },
         {
@@ -27,8 +28,9 @@
             ],
             "stopOnEntry": false,
             "skipFiles": [
-                "${workspaceRoot}/node_modules/**/*.js",
-                "<node_internals>/**/*.js"
+                "${workspaceRoot}/node_modules/**/*",
+                "/Applications/Visual Studio Code.app/Contents/Resources/app/extensions/**/*",
+                "<node_internals>/**/*"
             ]
         },
         {

CHANGELOG.md

@@ -1,6 +1,15 @@
 # Push Changelog
 All notable changes to Push will be documented in this file. If this file has appeared within Visual Studio Code, it means that Push has had a notable update. You can easily disable this feature by setting the `njpPush.showChangelog` to `false`.
 
+## 0.6.0
+ - Added "Upload/queue from commit hash" feature. You can now upload files changed in a specific Git commit.
+ - Added nicer icons for uploading, added a title menu upload button.
+ - Added option to ignore the project root when traversing upwards for service files.
+ - Altered default jsonc file comment to illustrate environments.
+ - Improvements to Uri handling across the codebase.
+ - Caching improvements.
+ - Many smaller improvements and fixes.
+
 ## 0.5.2
  - Fixed issue where the output panel would open regardless of whether there was an error during transfers.
  - Fixed issue with messaging when selecting a service environment on files outside of a workspace root.

extension.js

@@ -13,6 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+/**
+ * Visual Studio Code API - Uri class.
+ * @typedef {object} Uri
+ * @see https://code.visualstudio.com/docs/extensionAPI/vscode-api#Uri
+ */
 const vscode = require('vscode');
 const UI = require('./src/UI');
 
@@ -34,6 +40,8 @@ exports.activate = (context) => {
 		'push.clearUploadQueue': 'clearUploadQueue',
 		'push.queueGitChangedFiles': 'queueGitChangedFiles',
 		'push.uploadGitChangedFiles': 'uploadGitChangedFiles',
+		'push.queueGitCommit': 'queueGitCommit',
+		'push.uploadGitCommit': 'uploadGitCommit',
 		'push.cancelQueues': 'cancelQueues',
 		'push.stopQueues': 'stopQueues',
 		'push.addWatchFile': 'addWatch',