Skip to content

Commit

Permalink
Merge pull request #3717 from camptocamp/typos
Browse files Browse the repository at this point in the history
Fix typos in migration doc and source code
  • Loading branch information
fredj committed Mar 28, 2018
2 parents 0e3d88e + 903cfdf commit b10db81
Show file tree
Hide file tree
Showing 25 changed files with 36 additions and 36 deletions.
2 changes: 1 addition & 1 deletion contribs/gmf/src/authentication/component.html
Expand Up @@ -96,7 +96,7 @@ <h4 class="modal-title">
</h4>
</div>
<div class="modal-body">
{{'Your password has succesfully been changed.' | translate}}
{{'Your password has successfully been changed.' | translate}}
</div>
<div class="modal-footer">
<button type="button"
Expand Down
2 changes: 1 addition & 1 deletion contribs/gmf/src/authentication/component.js
Expand Up @@ -368,7 +368,7 @@ gmf.authentication.component.AuthenticationController_ = class {
return;
}

const error = gettextCatalog.getString('An error occured while reseting the password.');
const error = gettextCatalog.getString('An error occurred while resetting the password.');

/**
* @param {gmfx.AuthenticationDefaultResponse} respData Response.
Expand Down
4 changes: 2 additions & 2 deletions contribs/gmf/src/controllers/AbstractAppController.js
Expand Up @@ -438,7 +438,7 @@ gmf.controllers.AbstractAppController = function(config, $scope, $injector) {
this.updateCurrentBackgroundLayer_(false);

// Static "not used" functions should be in the window because otherwise
// closure remove them. "export" tag doens't work on static function below,
// closure remove them. "export" tag doesn't work on static function below,
// we "export" them as externs in the gmfx options file.
const gmfx = window.gmfx || {};
/**
Expand Down Expand Up @@ -583,7 +583,7 @@ gmf.controllers.AbstractAppController = function(config, $scope, $injector) {


/**
* @return {boolean} Return true if a user exists and its 'is_password_changed' value is explicitely set
* @return {boolean} Return true if a user exists and its 'is_password_changed' value is explicitly set
* to false.
* @export
*/
Expand Down
2 changes: 1 addition & 1 deletion contribs/gmf/src/datasource/ExternalDataSourcesManager.js
Expand Up @@ -654,7 +654,7 @@ gmf.datasource.ExternalDataSourcesManager = class {
*
* Please, note that this is used to generate a unique id for the created
* external data sources and since a WMS/WMTS Capability Layer objects don't
* natively contains an id by themselves, then it is programatically generated
* natively contains an id by themselves, then it is programmatically generated
* using the `ol.getUid` method, plus a million.
*
* @param {!Object} layer WMS/WMTS Capability Layer object.
Expand Down
2 changes: 1 addition & 1 deletion contribs/gmf/src/datasource/WFSAliases.js
Expand Up @@ -7,7 +7,7 @@ gmf.datasource.WFSAliases = class {

/**
* Service that provides methods to get additional information and actions
* when perfoming WFS requests.
* when performing WFS requests.
*
* @struct
* @param {ngeo.datasource.Helper} ngeoDataSourcesHelper Ngeo data
Expand Down
2 changes: 1 addition & 1 deletion contribs/gmf/src/editing/editFeatureComponent.js
Expand Up @@ -74,7 +74,7 @@ gmf.editing.editFeatureComponent = angular.module('GmfEditingFeatureComponent',
* In order to modify or delete a feature, you must click on the map at the
* location of the feature to select it first.
*
* In order to create a new feature, you use the "Draw" button and digitalize
* In order to create a new feature, you use the "Draw" button and digitize
* the feature on the map.
*
* Example:
Expand Down
2 changes: 1 addition & 1 deletion contribs/gmf/src/layertree/timesliderComponent.js
Expand Up @@ -32,7 +32,7 @@ gmf.layertree.timeSliderComponent = angular.module('gmfLayertreeTimeSliderCompon
* </gmf-time-slider>
*
* @htmlAttribute {ngeox.TimeProperty} gmf-time-slider-time parameter for initialization.
* @htmlAttribute {function()} gmf-time-slider-on-date-selected Expresion evaluated after
* @htmlAttribute {function()} gmf-time-slider-on-date-selected Expression evaluated after
* date(s) changed
* @param {angular.$timeout} $timeout angular timeout service
* @param {angular.$filter} $filter angular filter service
Expand Down
6 changes: 3 additions & 3 deletions contribs/gmf/src/mobile/navigation/component.js
Expand Up @@ -54,7 +54,7 @@ gmf.mobile.navigation.component.component_ = function() {
/**
* @param {angular.Scope} scope Scope.
* @param {angular.JQLite} element Element.
* @param {angular.Attributes} attrs Atttributes.
* @param {angular.Attributes} attrs Attributes.
* @param {gmf.mobile.navigation.component.Controller_} navCtrl Controller.
*/
link: (scope, element, attrs, navCtrl) => {
Expand Down Expand Up @@ -288,7 +288,7 @@ gmf.mobile.navigation.component.backDirective = function() {
/**
* @param {angular.Scope} scope Scope.
* @param {angular.JQLite} element Element.
* @param {angular.Attributes} attrs Atttributes.
* @param {angular.Attributes} attrs Attributes.
* @param {gmf.mobile.navigation.component.Controller_} navCtrl Controller.
*/
link: (scope, element, attrs, navCtrl) => {
Expand Down Expand Up @@ -330,7 +330,7 @@ gmf.mobile.navigation.component.backOnClickDirective = function() {
/**
* @param {angular.Scope} scope Scope.
* @param {angular.JQLite} element Element.
* @param {angular.Attributes} attrs Atttributes.
* @param {angular.Attributes} attrs Attributes.
* @param {gmf.mobile.navigation.component.Controller_} navCtrl Controller.
*/
link: (scope, element, attrs, navCtrl) => {
Expand Down
2 changes: 1 addition & 1 deletion contribs/gmf/src/objectediting/Manager.js
Expand Up @@ -112,7 +112,7 @@ gmf.objectediting.Manager.prototype.getLayerNodeId = function() {


/**
* Called after getting features with comparison filters. Resolve the defered
* Called after getting features with comparison filters. Resolve the deferred
* promise with the first returned feature (if any), otherwise resolve it
* with a feature created with an empty geometry and the property key + value
* that was used in the attempt to fetch it.
Expand Down
2 changes: 1 addition & 1 deletion contribs/gmf/src/search/component.js
Expand Up @@ -135,7 +135,7 @@ function gmfSearchTemplateUrl($element, $attrs, gmfSearchTemplateUrl) {
* The datasources.
* @htmlAttribute {Object.<string, ol.style.Style>}
* gmf-search-styles A map of styles to apply on searched features. Keys
* must be the 'layer_name' propertie of features except for coordinates
* must be the 'layer_name' property of features except for coordinates
* where the key ifor its style is the value of the constant
* 'gmf.COORDINATES_LAYER_NAME'. The 'default' key is used to apply the
* default style.
Expand Down
6 changes: 3 additions & 3 deletions docs/how_to_migrate_from_2.2_to_2.3.md
Expand Up @@ -35,7 +35,7 @@ use anymore this library (and we will also stop using google closure to build ou
functions: `goog.asserts`, `goog.require` and `goog.provide` (and `goog.module` but you should not have any
in your code for now). We can ignore them because we will provide them with a script, later.

To search occurences of `goog` functions (without above exceptions) you can use this command (unix):
To search occurrences of `goog` functions (without above exceptions) you can use this command (unix):

```
git grep goog <path_to_apps_folder> | grep -v 'require' | grep -v 'provide' | grep -v 'asserts' | grep -v 'google'
Expand Down Expand Up @@ -78,7 +78,7 @@ It can help to see how `component`, `service`, `factory`, etc. are made in ngeo

Note for GeoMapFish:
Your application main controllers (files in static-ngeo/js/<application>.js). Are also concerned.
But as the build expects to find the inteface name in the 'goog.provide', you must potentialy rename
But as the build expects to find the interface name in the 'goog.provide', you must potentialy rename
your file to match the interface name.
Example: you have a `ngeodesktop` interface, that means that your file must be named `ngeodesktop.js` and the
file must provide `<an_app_name>_ngeodesktop`. You may have to exceptionnaly adapt this line in your
Expand Down Expand Up @@ -161,7 +161,7 @@ Test, then commit your changes.

## Use ngeo 2.3

At this point you can update your application to use ngeo 2.3. It's recommanded to work on a branch, because
At this point you can update your application to use ngeo 2.3. It's recommended to work on a branch, because
the changes can't be easily tested before the end of the transformation.

### Summary
Expand Down
8 changes: 4 additions & 4 deletions src/datasource/OGC.js
Expand Up @@ -17,7 +17,7 @@ ngeo.datasource.OGC = class extends ngeo.datasource.DataSource {

/**
* A data source contains information of a single source of data that can
* show or fetch the data using an OGC server. Serveral OGC service types are
* show or fetch the data using an OGC server. Several OGC service types are
* supported by this data source: WMS, WMTS and even WFS.
*
* You can use the information stored within an OGC data source to do all
Expand Down Expand Up @@ -809,7 +809,7 @@ ngeo.datasource.OGC = class extends ngeo.datasource.DataSource {
/**
* Check if there's at least one OGC layer in range of a given resolution.
* @param {number} res Resolution.
* @param {boolean} queryableOnly Whether to additionnally check if the
* @param {boolean} queryableOnly Whether to additionally check if the
* OGC layer is queryable as well or not. Defaults to `false`.
* @return {boolean} At least one OGC layer is in range.
* @export
Expand All @@ -822,7 +822,7 @@ ngeo.datasource.OGC = class extends ngeo.datasource.DataSource {
* Returns a list of OGC layer names that are in range of a given resolution.
* If there's no OGC layers defined, an empty array is returned.
* @param {number} res Resolution.
* @param {boolean} queryableOnly Whether to additionnally check if the
* @param {boolean} queryableOnly Whether to additionally check if the
* OGC layer is queryable as well or not. Defaults to `false`.
* @return {Array.<string>} The OGC layer names that are in range.
* @export
Expand Down Expand Up @@ -850,7 +850,7 @@ ngeo.datasource.OGC = class extends ngeo.datasource.DataSource {

/**
* Returns the list of OGC layer names.
* @param {boolean} queryableOnly Whether to additionnally check if the
* @param {boolean} queryableOnly Whether to additionally check if the
* OGC layer is queryable as well or not. Defaults to `false`.
* @return {Array.<string>} The OGC layer names.
* @export
Expand Down
4 changes: 2 additions & 2 deletions src/map/component.js
Expand Up @@ -46,7 +46,7 @@ ngeo.map.component.directive_ = function($window) {
/**
* @param {angular.Scope} scope Scope.
* @param {angular.JQLite} element Element.
* @param {angular.Attributes} attrs Atttributes.
* @param {angular.Attributes} attrs Attributes.
*/
link: (scope, element, attrs) => {
// Get the 'ol.Map' object from attributes and manage it accordingly
Expand All @@ -58,7 +58,7 @@ ngeo.map.component.directive_ = function($window) {

map.setTarget(element[0]);

// Get the 'window resize' attributes, which are optionnal. If defined,
// Get the 'window resize' attributes, which are optional. If defined,
// the browser window 'resize' event is listened to update the size of
// the map when fired. A transition option is also available to let any
// animation that may occur on the div of the map to smootly resize the
Expand Down
2 changes: 1 addition & 1 deletion src/map/resizemap.js
Expand Up @@ -38,7 +38,7 @@ ngeo.map.resizemap.directive_ = function($window) {
/**
* @param {angular.Scope} scope Scope.
* @param {angular.JQLite} element Element.
* @param {angular.Attributes} attrs Atttributes.
* @param {angular.Attributes} attrs Attributes.
*/
link: (scope, element, attrs) => {
const attr = 'ngeoResizemap';
Expand Down
2 changes: 1 addition & 1 deletion src/map/scaleselector.js
Expand Up @@ -74,7 +74,7 @@ ngeo.map.scaleselector.value('ngeoScaleselectorTemplateUrl',
* @htmlAttribute {!Array.<number>} ngeo-scaleselector The available scales.
* @htmlAttribute {ol.Map} ngeo-scaleselector-map The map.
* @htmlAttribute {ngeox.ScaleselectorOptions} ngeo-scaleselector-options
* Optionnal. The configuration options.
* Optional. The configuration options.
* @param {string|function(!angular.JQLite=, !angular.Attributes=)}
* ngeoScaleselectorTemplateUrl Template URL for the directive.
* @return {angular.Directive} Directive Definition Object.
Expand Down
2 changes: 1 addition & 1 deletion src/message/popupcomponent.js
Expand Up @@ -56,7 +56,7 @@ ngeo.message.popupComponent.directive_ = function(ngeoPopupTemplateUrl) {
/**
* @param {angular.Scope} scope Scope.
* @param {angular.JQLite} element Element.
* @param {angular.Attributes} attrs Atttributes.
* @param {angular.Attributes} attrs Attributes.
*/
link: (scope, element, attrs) => {
element.addClass('popover');
Expand Down
4 changes: 2 additions & 2 deletions src/misc/btnComponent.js
Expand Up @@ -47,7 +47,7 @@ ngeo.misc.btnComponent.btnGroupComponent_ = function($parse) {
/**
* @param {!angular.Scope} scope Scope.
* @param {!angular.JQLite=} element Element.
* @param {!angular.Attributes=} attrs Atttributes.
* @param {!angular.Attributes=} attrs Attributes.
* @param {!ngeo.misc.btnComponent.BtnGroupController=} controller Controller.
*/
link: (scope, element, attrs, controller) => {
Expand Down Expand Up @@ -144,7 +144,7 @@ ngeo.misc.btnComponent.btnComponent_ = function($parse) {
/**
* @param {!angular.Scope} scope Scope.
* @param {!angular.JQLite=} element Element.
* @param {!angular.Attributes=} attrs Atttributes.
* @param {!angular.Attributes=} attrs Attributes.
* @param {!Array.<!Object>=} ctrls Controller.
*/
link: (scope, element, attrs, ctrls) => {
Expand Down
2 changes: 1 addition & 1 deletion src/misc/controlComponent.js
Expand Up @@ -37,7 +37,7 @@ ngeo.misc.controlComponent.component_ = function() {
/**
* @param {angular.Scope} scope Scope.
* @param {angular.JQLite} element Element.
* @param {angular.Attributes} attrs Atttributes.
* @param {angular.Attributes} attrs Attributes.
*/
link: (scope, element, attrs) => {

Expand Down
2 changes: 1 addition & 1 deletion src/misc/datepickerComponent.js
Expand Up @@ -34,7 +34,7 @@ ngeo.misc.datepickerComponent.value('ngeoDatePickerTemplateUrl',


/**
* Provide a directive to select a signle date or a range of dates. Requires
* Provide a directive to select a single date or a range of dates. Requires
* jQuery UI for the 'datepicker' widget.
*
* @param {string|function(!angular.JQLite=, !angular.Attributes=)}
Expand Down
2 changes: 1 addition & 1 deletion src/misc/filereaderComponent.js
Expand Up @@ -38,7 +38,7 @@ ngeo.misc.filereaderComponent.component_ = function($window) {
/**
* @param {angular.Scope} scope Scope.
* @param {angular.JQLite} element Element.
* @param {angular.Attributes} attrs Atttributes.
* @param {angular.Attributes} attrs Attributes.
*/
link: (scope, element, attrs) => {
const supported = 'FileReader' in $window;
Expand Down
2 changes: 1 addition & 1 deletion src/misc/sortableComponent.js
Expand Up @@ -58,7 +58,7 @@ ngeo.misc.sortableComponent.component_ = function($timeout) {
/**
* @param {angular.Scope} scope Scope.
* @param {angular.JQLite} element Element.
* @param {angular.Attributes} attrs Atttributes.
* @param {angular.Attributes} attrs Attributes.
*/
link: (scope, element, attrs) => {

Expand Down
4 changes: 2 additions & 2 deletions src/print/Utils.js
Expand Up @@ -253,9 +253,9 @@ ngeo.print.Utils.prototype.getBottomLeftCorner = function(mapCenter) {


/**
* Get the coordinates of the bottom rigth corner of the printed map.
* Get the coordinates of the bottom right corner of the printed map.
* @param {ol.Coordinate} mapCenter Center of the map to print.ç
* @return {ol.Coordinate} The coordinates of the bottom rigth corner.
* @return {ol.Coordinate} The coordinates of the bottom right corner.
*/
ngeo.print.Utils.prototype.getBottomRightCorner = function(mapCenter) {
return [mapCenter[0] + this.extentHalfHorizontalDistance_,
Expand Down
2 changes: 1 addition & 1 deletion src/profile/elevationComponent.js
Expand Up @@ -53,7 +53,7 @@ ngeo.profile.elevationComponent.directive_ = function(ngeoDebounce) {
/**
* @param {angular.Scope} scope Scope.
* @param {angular.JQLite} element Element.
* @param {angular.Attributes} attrs Atttributes.
* @param {angular.Attributes} attrs Attributes.
*/
link: (scope, element, attrs) => {

Expand Down
2 changes: 1 addition & 1 deletion src/rule/rule.js
Expand Up @@ -20,7 +20,7 @@ ngeo.rule.Rule = class {
* - and an expression, for example 'Chicoutimi'.
*
* A rule is useful to hold those properties and change them on the fly.
* For example, chaning an operator from 'is equal to' to 'like'.
* For example, changing an operator from 'is equal to' to 'like'.
*
* Also, a rule is especially useful for its `value` getter, which returns
* the combination of properties described above or `null` if there are some
Expand Down
2 changes: 1 addition & 1 deletion src/search/searchdirective.js
Expand Up @@ -30,7 +30,7 @@ ngeo.search.searchDirective = function() {
/**
* @param {angular.Scope} scope Scope.
* @param {angular.JQLite} element Element.
* @param {angular.Attributes} attrs Atttributes.
* @param {angular.Attributes} attrs Attributes.
*/
link: (scope, element, attrs) => {

Expand Down

0 comments on commit b10db81

Please sign in to comment.