diff --git a/docs/_docs/guides/013-branching.md b/docs/_docs/guides/013-branching.md index 66b7e05548..12146eef7b 100644 --- a/docs/_docs/guides/013-branching.md +++ b/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 diff --git a/docs/_docs/guides/open-source-contributors.md b/docs/_docs/guides/open-source-contributors.md index c8684c9f7c..772acee666 100644 --- a/docs/_docs/guides/open-source-contributors.md +++ b/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 mysql@8.0 Note, to install the exact same `maven` version as the wrapper: `brew install maven@3.8` (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: diff --git a/webapp/src/main/java/com/box/l10n/mojito/FlyWayConfig.java b/webapp/src/main/java/com/box/l10n/mojito/FlyWayConfig.java index 1e3babd958..be4e0d999a 100644 --- a/webapp/src/main/java/com/box/l10n/mojito/FlyWayConfig.java +++ b/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. * *

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. * *

For now this is enabled manually in the database with: CREATE TABLE * flyway_clean_protection(enabled boolean default true); INSERT INTO flyway_clean_protection diff --git a/webapp/src/main/java/com/box/l10n/mojito/quartz/QuartzPollableTaskScheduler.java b/webapp/src/main/java/com/box/l10n/mojito/quartz/QuartzPollableTaskScheduler.java index 8afcc39dd3..9c85682f17 100644 --- a/webapp/src/main/java/com/box/l10n/mojito/quartz/QuartzPollableTaskScheduler.java +++ b/webapp/src/main/java/com/box/l10n/mojito/quartz/QuartzPollableTaskScheduler.java @@ -85,8 +85,8 @@ public PollableFuture 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 * @param diff --git a/webapp/src/main/java/com/box/l10n/mojito/rest/asset/AssetWS.java b/webapp/src/main/java/com/box/l10n/mojito/rest/asset/AssetWS.java index 44aa6e64cc..04dff59e8d 100644 --- a/webapp/src/main/java/com/box/l10n/mojito/rest/asset/AssetWS.java +++ b/webapp/src/main/java/com/box/l10n/mojito/rest/asset/AssetWS.java @@ -434,7 +434,7 @@ public Set 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 diff --git a/webapp/src/main/java/com/box/l10n/mojito/service/boxsdk/BoxSDKServiceConfigEntityService.java b/webapp/src/main/java/com/box/l10n/mojito/service/boxsdk/BoxSDKServiceConfigEntityService.java index 11cb12d8aa..cd12dd6694 100644 --- a/webapp/src/main/java/com/box/l10n/mojito/service/boxsdk/BoxSDKServiceConfigEntityService.java +++ b/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. * |-> Mojito |-> Project Requests * - *

Note: We're creating a Mojito root folder to store everythign related to Mojito because an + *

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 * *

Note: for now, we're only creating the Project Requests (Drops) folder. Maybe later when we diff --git a/webapp/src/main/java/com/box/l10n/mojito/service/repository/RepositoryService.java b/webapp/src/main/java/com/box/l10n/mojito/service/repository/RepositoryService.java index 2dd7846bd2..fa6dc7d275 100644 --- a/webapp/src/main/java/com/box/l10n/mojito/service/repository/RepositoryService.java +++ b/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. * *

This run stays with {@link ScreenshotRun#lastSuccessfulRun} set to {@code false}. * diff --git a/webapp/src/main/java/com/box/l10n/mojito/service/thirdparty/ThirdPartyService.java b/webapp/src/main/java/com/box/l10n/mojito/service/thirdparty/ThirdPartyService.java index 0524677f9c..281cdbb1d3 100644 --- a/webapp/src/main/java/com/box/l10n/mojito/service/thirdparty/ThirdPartyService.java +++ b/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 * *

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 diff --git a/webapp/src/main/java/com/box/l10n/mojito/service/thirdparty/ThirdPartyTMSInMemory.java b/webapp/src/main/java/com/box/l10n/mojito/service/thirdparty/ThirdPartyTMSInMemory.java index 30117be7bd..aab1e7bd92 100644 --- a/webapp/src/main/java/com/box/l10n/mojito/service/thirdparty/ThirdPartyTMSInMemory.java +++ b/webapp/src/main/java/com/box/l10n/mojito/service/thirdparty/ThirdPartyTMSInMemory.java @@ -55,7 +55,7 @@ public List 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(); } diff --git a/webapp/src/main/java/com/box/l10n/mojito/service/thirdparty/ThirdPartyTMSSmartling.java b/webapp/src/main/java/com/box/l10n/mojito/service/thirdparty/ThirdPartyTMSSmartling.java index 763e976119..b2f0c951df 100644 --- a/webapp/src/main/java/com/box/l10n/mojito/service/thirdparty/ThirdPartyTMSSmartling.java +++ b/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); } diff --git a/webapp/src/main/java/com/box/l10n/mojito/service/thirdparty/smartling/SmartlingResultProcessor.java b/webapp/src/main/java/com/box/l10n/mojito/service/thirdparty/smartling/SmartlingResultProcessor.java index e6df0dc871..538d6040d7 100644 --- a/webapp/src/main/java/com/box/l10n/mojito/service/thirdparty/smartling/SmartlingResultProcessor.java +++ b/webapp/src/main/java/com/box/l10n/mojito/service/thirdparty/smartling/SmartlingResultProcessor.java @@ -47,7 +47,7 @@ private String processAction(List 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); } diff --git a/webapp/src/main/java/com/box/l10n/mojito/service/thirdparty/smartling/quartz/SmartlingPullLocaleFileJob.java b/webapp/src/main/java/com/box/l10n/mojito/service/thirdparty/smartling/quartz/SmartlingPullLocaleFileJob.java index 2d8a973e1b..8f02159cb4 100644 --- a/webapp/src/main/java/com/box/l10n/mojito/service/thirdparty/smartling/quartz/SmartlingPullLocaleFileJob.java +++ b/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); } diff --git a/webapp/src/main/java/com/box/l10n/mojito/smartling/AssetPathAndTextUnitNameKeys.java b/webapp/src/main/java/com/box/l10n/mojito/smartling/AssetPathAndTextUnitNameKeys.java index 4e7a0e27d3..188a9a311e 100644 --- a/webapp/src/main/java/com/box/l10n/mojito/smartling/AssetPathAndTextUnitNameKeys.java +++ b/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]); diff --git a/webapp/src/main/java/com/box/l10n/mojito/smartling/SmartlingJsonKeys.java b/webapp/src/main/java/com/box/l10n/mojito/smartling/SmartlingJsonKeys.java index 507619914e..0e0ec55a09 100644 --- a/webapp/src/main/java/com/box/l10n/mojito/smartling/SmartlingJsonKeys.java +++ b/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]); diff --git a/webapp/src/main/resources/public/js/components/workbench/TextUnit.js b/webapp/src/main/resources/public/js/components/workbench/TextUnit.js index 58057b16b3..f55ddae76d 100644 --- a/webapp/src/main/resources/public/js/components/workbench/TextUnit.js +++ b/webapp/src/main/resources/public/js/components/workbench/TextUnit.js @@ -826,7 +826,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. */ diff --git a/webapp/src/test/java/com/box/l10n/mojito/service/NormalizationUtilsTest.java b/webapp/src/test/java/com/box/l10n/mojito/service/NormalizationUtilsTest.java index 26878041dd..5de7273588 100644 --- a/webapp/src/test/java/com/box/l10n/mojito/service/NormalizationUtilsTest.java +++ b/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(); diff --git a/webapp/src/test/java/com/box/l10n/mojito/service/thirdparty/smartling/SmartlingResultProcessorTest.java b/webapp/src/test/java/com/box/l10n/mojito/service/thirdparty/smartling/SmartlingResultProcessorTest.java index be9452eeb3..147c3475d9 100644 --- a/webapp/src/test/java/com/box/l10n/mojito/service/thirdparty/smartling/SmartlingResultProcessorTest.java +++ b/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); }