Merge branch 'master' into user_locales

Author: aurambaj

docs/_docs/guides/013-branching.md

@@ -169,7 +169,7 @@ or if the source strings are changed:
 
 ### Branch dashboard
 
-The branch dashboard is the place where developpers can check the translation status of their pull request and upload 
+The branch dashboard is the place where developers can check the translation status of their pull request and upload 
 screenshots for the strings that were created.
 
 #### Search branches

docs/_docs/guides/open-source-contributors.md

@@ -12,10 +12,10 @@ The following requirements are needed to develop on {{ site.mojito_green }}:
 1. [Git](https://git-scm.com/about)
 2. [JDK 17](https://adoptium.net/temurin/releases/?version=17) 
 3. [Maven](https://maven.apache.org/download.cgi), or use the project Maven wrapper `mvnw` (version `3.8`)
-4. Optional but highly recommanded, [MySQL 8](https://dev.mysql.com/downloads/mysql/8.html) 
+4. Optional but highly recommended, [MySQL 8](https://dev.mysql.com/downloads/mysql/8.html) 
 
-Next are instructions to setup the developper environment on Mac OS and Ubuntu. Both have instructions to install 
-`Mysql 8` that can be skipped but it is highly recommanded to work with a production like environment and persistent
+Next are instructions to setup the developer environment on Mac OS and Ubuntu. Both have instructions to install 
+`Mysql 8` that can be skipped but it is highly recommended to work with a production like environment and persistent
 data. Note that `8` is the only version tested at the moment.
 
 Skip to the [build section](#build) if you already have everything setup!
@@ -56,7 +56,7 @@ brew install [email protected]
 Note, to install the exact same `maven` version as the wrapper: `brew install [email protected]` (check the instructions since it is key-only) .
 
 
-### Install on Unbutu 18.4 LTS
+### Install on Ubuntu 18.4 LTS
 
 Install `java 17` from `OpenJDK`:
 
@@ -89,7 +89,7 @@ sudo apt-get install mysql-server
 ## Create Mysql Databases & configuration files
 
 If you've decided to use `Mysql` the server needs to be configured for better Unicode support. This section also describes 
-how to create 2 databases along with spring configuraitons to setup 2 envrionments that will make developpment easier.
+how to create 2 databases along with spring configurations to setup 2 environments that will make development easier.
 
 Configure the server to use `utf-8` on `4 bytes` by default by appending these configurations to 
 `/usr/local/etc/my.cnf` file on Mac and to `/etc/mysql/my.cnf` file on Ubuntu:

webapp/src/main/java/com/box/l10n/mojito/FlyWayConfig.java

@@ -154,8 +154,8 @@ void tryToMigrateIfMysql8Migration(Flyway flyway, FlywayException fe) {
    * since a failure to perform the query will show that the DB is not protected.
    *
    * <p>This is an extra check added to the settings: spring.flyway.clean-disabled=true (now default
-   * in Mojito) and l10n.flyway.clean=false (that is usally set manualy, but can be wrongly enabled)
-   * and shouldn't be soly relied upon.
+   * in Mojito) and l10n.flyway.clean=false (that is usually set manually, but can be wrongly enabled)
+   * and shouldn't be solely relied upon.
    *
    * <p>For now this is enabled manually in the database with: CREATE TABLE
    * flyway_clean_protection(enabled boolean default true); INSERT INTO flyway_clean_protection

webapp/src/main/java/com/box/l10n/mojito/quartz/QuartzPollableTaskScheduler.java

@@ -85,8 +85,8 @@ public <I, O> PollableFuture<O> scheduleJobWithCustomTimeout(
    * @param expectedSubTaskNumber set on the pollable task
    * @param triggerStartDate date at which the job should be started
    * @param uniqueId optional id used to generate the job keyname. If not provided the pollable task
-   *     id is used. Pollable id keeps changing, unique id can be used for recuring jobs (eg. update
-   *     stats of repositry xyz)
+   *     id is used. Pollable id keeps changing, unique id can be used for recurring jobs (eg. update
+   *     stats of repository xyz)
    * @param inlineInput to inline the input in quartz data or save it in the blobstorage
    * @param <I>
    * @param <O>

webapp/src/main/java/com/box/l10n/mojito/rest/asset/AssetWS.java

@@ -434,7 +434,7 @@ public Set<Long> getAssetIds(
       @RequestParam(value = "virtual", required = false) Boolean virtual,
       @RequestParam(value = "branchId", required = false) Long branchId) {
 
-    // not the best to fetch the whole asset (espcially for old one that have content, though with
+    // not the best to fetch the whole asset (especially for old one that have content, though with
     // branch that
     // will change. Wanted to use spring project but it is not working for some reason. Since soon
     // asset won't have

webapp/src/main/java/com/box/l10n/mojito/service/boxsdk/BoxSDKServiceConfigEntityService.java

@@ -211,7 +211,7 @@ public void deleteConfig()
    * When root folder is not provided, create the following structure inside user's root. <UserRoot>
    * |-> Mojito |-> Project Requests
    *
-   * <p>Note: We're creating a Mojito root folder to store everythign related to Mojito because an
+   * <p>Note: We're creating a Mojito root folder to store everything related to Mojito because an
    * App User can be accessible by other API keys
    *
    * <p>Note: for now, we're only creating the Project Requests (Drops) folder. Maybe later when we

webapp/src/main/java/com/box/l10n/mojito/service/repository/RepositoryService.java

@@ -159,7 +159,7 @@ public Repository createRepository(
 
   /**
    * Adds the {@link com.box.l10n.mojito.entity.ScreenshotRun} that will be used to store
-   * screenshots uploaded by developpers/manually.
+   * screenshots uploaded by developers/manually.
    *
    * <p>This run stays with {@link ScreenshotRun#lastSuccessfulRun} set to {@code false}.
    *

webapp/src/main/java/com/box/l10n/mojito/service/thirdparty/ThirdPartyService.java

@@ -451,7 +451,7 @@ void uploadImageWithMappings(String projectId, Screenshot screenshot, Image imag
     } else {
       logger.debug(
           "No text units to be mapped so we don't upload the image (might be late to perform the mapping and/or it"
-              + "is not usefull to send the image)");
+              + "is not useful to send the image)");
     }
   }
 
@@ -460,7 +460,7 @@ void uploadImageWithMappings(String projectId, Screenshot screenshot, Image imag
    *
    * <p>We want to upload image only if we have mapped text units (if not it is probably because the
    * sync is delayed or failed and so there is no point uploading the image) so we need to build
-   * that list first eventhough the imageId is not available yet. The imageId will be set after the
+   * that list first even though the imageId is not available yet. The imageId will be set after the
    * image has been uploaded
    *
    * @param screenshot

webapp/src/main/java/com/box/l10n/mojito/service/thirdparty/ThirdPartyTMSInMemory.java

@@ -55,7 +55,7 @@ public List<ThirdPartyTextUnit> getThirdPartyTextUnits(
         projectId);
 
     // TODO return empty for now but later the interface will support adding strings and so this can
-    // retrun them
+    // return them
     return Collections.emptyList();
   }
 

webapp/src/main/java/com/box/l10n/mojito/service/thirdparty/ThirdPartyTMSSmartling.java

@@ -480,7 +480,7 @@ private SmartlingFile uploadTextUnitsToSmartling(
       file.setFileContent(writer.toText());
 
     } catch (ParserConfigurationException | TransformerException e) {
-      logger.error("An error ocurred when processing a push batch", e);
+      logger.error("An error occurred when processing a push batch", e);
       throw new RuntimeException(e);
     }
 
@@ -770,7 +770,7 @@ private SmartlingFile processTranslationBatch(
         file.setFileContent(writer.toText());
 
       } catch (ParserConfigurationException | TransformerException e) {
-        logger.error("An error ocurred when processing a push_translations batch", e);
+        logger.error("An error occurred when processing a push_translations batch", e);
         throw new RuntimeException(e);
       }
 

webapp/src/main/java/com/box/l10n/mojito/service/thirdparty/smartling/SmartlingResultProcessor.java

@@ -47,7 +47,7 @@ private String processAction(List<SmartlingFile> files, SmartlingOptions options
             "{} result for request id {} uploaded to: {}", action, options.getRequestId(), result);
       } catch (IOException | SdkClientException e) {
         String errorMessage =
-            String.format("An error ocurred when uploading a %s result zip file", action);
+            String.format("An error occurred when uploading a %s result zip file", action);
         logger.error(errorMessage, e);
         throw new RuntimeException(errorMessage, e);
       }

webapp/src/main/java/com/box/l10n/mojito/service/thirdparty/smartling/quartz/SmartlingPullLocaleFileJob.java

@@ -108,7 +108,7 @@ && matchesChecksumFromPreviousSync(input, localeTag, fileName, fileContent)) {
       try {
         textUnits = mapper.mapToTextUnits(AndroidStringDocumentReader.fromText(fileContent));
       } catch (ParserConfigurationException | IOException | SAXException e) {
-        String msg = "An error ocurred when processing a pull batch";
+        String msg = "An error occurred when processing a pull batch";
         logger.error(msg, e);
         throw new RuntimeException(msg, e);
       }

webapp/src/main/java/com/box/l10n/mojito/smartling/AssetPathAndTextUnitNameKeys.java

@@ -17,7 +17,7 @@ public Key parse(String string) {
     Preconditions.checkNotNull(string);
     String[] split = string.split(DELIMITER, 2);
     if (split.length != 2) {
-      throw new IllegalArgumentException("must contain delimter #@#");
+      throw new IllegalArgumentException("must contain delimiter #@#");
     }
 
     return new Key(split[0], split[1]);

webapp/src/main/java/com/box/l10n/mojito/smartling/SmartlingJsonKeys.java

@@ -18,7 +18,7 @@ public Key parse(String string) {
     Preconditions.checkNotNull(string);
     String[] split = string.split(DELIMITER, 3);
     if (split.length != 3) {
-      throw new IllegalArgumentException("must contain 2 delimters: #@#");
+      throw new IllegalArgumentException("must contain 2 delimiters: #@#");
     }
 
     return new Key(Long.valueOf(split[0]), split[1], split[2]);

webapp/src/main/resources/public/js/components/workbench/TextUnit.js

@@ -827,7 +827,7 @@ let TextUnit = createReactClass({
     },
 
     /**
-     * render the source. If the source ends with a retrun line remove and
+     * render the source. If the source ends with a return line remove and
      * render a return line symbol so that the user as a clue about the trailing
      * return line.
      */

webapp/src/test/java/com/box/l10n/mojito/service/NormalizationUtilsTest.java

@@ -27,7 +27,7 @@ public void NormalizationICUvsJDK() {
               stopwatchICU.stop();
 
               Stopwatch stopwatchJDK = Stopwatch.createStarted();
-              // JDK can get very slow for langauge like hi-IN (ICU: PT0.043746286S , JDK:
+              // JDK can get very slow for language like hi-IN (ICU: PT0.043746286S , JDK:
               // PT27.087855617S) and bn_IN (ICU: PT0.08280765S , JDK: PT3M52.119210107S)
               String normalize2 = Normalizer.normalize(content, Normalizer.Form.NFC);
               stopwatchJDK.stop();

webapp/src/test/java/com/box/l10n/mojito/service/thirdparty/smartling/SmartlingResultProcessorTest.java

@@ -97,7 +97,7 @@ public void testProcessPushThrowsException() {
         SmartlingOptions.parseList(ImmutableList.of("dry-run=true", "request-id=" + requestId));
 
     assertThatThrownBy(() -> processor.processPush(files, smartlingOptions))
-        .hasMessageContaining("An error ocurred when uploading a push result zip file")
+        .hasMessageContaining("An error occurred when uploading a push result zip file")
         .isInstanceOf(RuntimeException.class);
   }