Skip to content

Commit 226a30b

Browse files
authored
Merge pull request #462 from lazmeister/language_and_variables_fix
Language and variables fix
2 parents 8e82cde + ac99080 commit 226a30b

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

projects/zxing-scanner/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@zxing/ngx-scanner",
3-
"version": "3.4.0",
3+
"version": "3.4.1",
44
"description": "High-performance Angular 8 barcode scanner component based on ZXing.",
55
"homepage": "https://github.com/zxing-js/ngx-scanner#readme",
66
"private": false,

projects/zxing-scanner/src/lib/browser-multi-format-continuous-reader.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export class BrowserMultiFormatContinuousReader extends BrowserMultiFormatReader
1010

1111
/**
1212
* Allows to call scanner controls API while scanning.
13-
* Will be undefined if no scanning is runnig.
13+
* Will be undefined if no scanning is running.
1414
*/
1515
protected scannerControls: IScannerControls;
1616

projects/zxing-scanner/src/lib/zxing-scanner.component.ts

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -117,61 +117,61 @@ export class ZXingScannerComponent implements OnInit, OnDestroy {
117117
autostart: boolean;
118118

119119
/**
120-
* How the preview element shoud be fit inside the :host container.
120+
* How the preview element should be fit inside the :host container.
121121
*/
122122
@Input()
123123
previewFitMode: 'fill' | 'contain' | 'cover' | 'scale-down' | 'none' = 'cover';
124124

125125
/**
126-
* Emitts events when the torch compatibility is changed.
126+
* Emits events when the torch compatibility is changed.
127127
*/
128128
@Output()
129129
torchCompatible: EventEmitter<boolean>;
130130

131131
/**
132-
* Emitts events when a scan is successful performed, will inject the string value of the QR-code to the callback.
132+
* Emits events when a scan is successful performed, will inject the string value of the QR-code to the callback.
133133
*/
134134
@Output()
135135
scanSuccess: EventEmitter<string>;
136136

137137
/**
138-
* Emitts events when a scan fails without errors, usefull to know how much scan tries where made.
138+
* Emits events when a scan fails without errors, useful to know how much scan tries where made.
139139
*/
140140
@Output()
141141
scanFailure: EventEmitter<Exception | undefined>;
142142

143143
/**
144-
* Emitts events when a scan throws some error, will inject the error to the callback.
144+
* Emits events when a scan throws some error, will inject the error to the callback.
145145
*/
146146
@Output()
147147
scanError: EventEmitter<Error>;
148148

149149
/**
150-
* Emitts events when a scan is performed, will inject the Result value of the QR-code scan (if available) to the callback.
150+
* Emits events when a scan is performed, will inject the Result value of the QR-code scan (if available) to the callback.
151151
*/
152152
@Output()
153153
scanComplete: EventEmitter<Result>;
154154

155155
/**
156-
* Emitts events when no cameras are found, will inject an exception (if available) to the callback.
156+
* Emits events when no cameras are found, will inject an exception (if available) to the callback.
157157
*/
158158
@Output()
159159
camerasFound: EventEmitter<MediaDeviceInfo[]>;
160160

161161
/**
162-
* Emitts events when no cameras are found, will inject an exception (if available) to the callback.
162+
* Emits events when no cameras are found, will inject an exception (if available) to the callback.
163163
*/
164164
@Output()
165165
camerasNotFound: EventEmitter<any>;
166166

167167
/**
168-
* Emitts events when the users answers for permission.
168+
* Emits events when the users answers for permission.
169169
*/
170170
@Output()
171171
permissionResponse: EventEmitter<boolean>;
172172

173173
/**
174-
* Emitts events when has devices status is update.
174+
* Emits events when has devices status is update.
175175
*/
176176
@Output()
177177
hasDevices: EventEmitter<boolean>;
@@ -195,7 +195,7 @@ export class ZXingScannerComponent implements OnInit, OnDestroy {
195195

196196
if (!this._ready) {
197197
this._devicePreStart = device;
198-
// let's ignore silently, users don't liek logs
198+
// let's ignore silently, users don't like logs
199199
return;
200200
}
201201

@@ -231,7 +231,7 @@ export class ZXingScannerComponent implements OnInit, OnDestroy {
231231
deviceChange: EventEmitter<MediaDeviceInfo>;
232232

233233
/**
234-
* User device acessor.
234+
* User device accessor.
235235
*/
236236
get device() {
237237
return this._device;
@@ -412,7 +412,7 @@ export class ZXingScannerComponent implements OnInit, OnDestroy {
412412
}
413413

414414
/**
415-
* Gets and registers all cammeras.
415+
* Gets and registers all cameras.
416416
*/
417417
async askForPermission(): Promise<boolean> {
418418

@@ -478,7 +478,7 @@ export class ZXingScannerComponent implements OnInit, OnDestroy {
478478
return;
479479
}
480480

481-
// configurates the component and starts the scanner
481+
// configures the component and starts the scanner
482482
await this.initAutostartOn();
483483

484484
this._ready = true;
@@ -568,7 +568,7 @@ export class ZXingScannerComponent implements OnInit, OnDestroy {
568568
public scanStart() {
569569

570570
if (this._scanSubscription) {
571-
throw new Error('There is already a scan proccess running.');
571+
throw new Error('There is already a scan process running.');
572572
}
573573

574574
if (!this._device) {
@@ -582,7 +582,7 @@ export class ZXingScannerComponent implements OnInit, OnDestroy {
582582
* Stops old `codeReader` and starts scanning in a new one.
583583
*/
584584
restart(): void {
585-
// @note apenas necessario por enquanto causa da Torch
585+
// note only necessary for now because of the Torch
586586
this._codeReader = undefined;
587587

588588
const prevDevice = this._reset();
@@ -608,7 +608,7 @@ export class ZXingScannerComponent implements OnInit, OnDestroy {
608608
this.camerasFound.next([...devices]);
609609

610610
if (!hasDevices) {
611-
this.camerasNotFound.next();
611+
this.camerasNotFound.next(null);
612612
}
613613

614614
return devices;
@@ -750,7 +750,7 @@ export class ZXingScannerComponent implements OnInit, OnDestroy {
750750
}
751751

752752
/**
753-
* Retorna um code reader, cria um se nenhume existe.
753+
* Return a code reader, create one if non exist
754754
*/
755755
private getCodeReader(): BrowserMultiFormatContinuousReader {
756756

@@ -869,7 +869,7 @@ export class ZXingScannerComponent implements OnInit, OnDestroy {
869869
}
870870

871871
/**
872-
* Sets the permission value and emmits the event.
872+
* Sets the permission value and emits the event.
873873
*/
874874
private setPermission(hasPermission: boolean | null): void {
875875
this.hasPermission = hasPermission;

0 commit comments

Comments
 (0)