Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: fix merge conflicts #1851

Merged
merged 11 commits into from
Oct 31, 2021
Merged

chore: fix merge conflicts #1851

merged 11 commits into from
Oct 31, 2021

Conversation

profnandaa
Copy link
Member

No description provided.

@codecov
Copy link

codecov bot commented Oct 31, 2021

Codecov Report

Merging #1851 (83cb7f8) into master (fc0fefc) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##            master     #1851   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          102       102           
  Lines         2054      2054           
  Branches       464       464           
=========================================
  Hits          2054      2054           
Impacted Files Coverage Δ
src/lib/isMobilePhone.js 100.00% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update fc0fefc...83cb7f8. Read the comment docs.

@profnandaa profnandaa force-pushed the chore/fix-merge-conflicts branch 2 times, most recently from 6f55dd1 to f79d045 Compare October 31, 2021 09:16
@profnandaa profnandaa force-pushed the chore/fix-merge-conflicts branch 2 times, most recently from 553e401 to 3c077d4 Compare October 31, 2021 10:13
ZeeMangena and others added 10 commits October 31, 2021 14:38
…ocales

chore: squashed commits from #1834

feat(isMobilePhone): regex for Namibia locale

fix(isMobilePhone): removing telephone validation

fix(isMobliePhone): regex now validates as intended

fix(isMobilePhone): requiring phone number prefixes in validation

feat(isMobilePhone): regex for Burkina Faso locale

fix(isMobilePhone): removing code intended for a different branch

fix(isMobilePhone): Making plus sign optional

feat(isMobilePhone): regex for Burkina Faso locale
chore: squashed #1829

Add locale for Maldives in mobile phone validator

Add tests for mobile numbers validation of maldives locale i.e. dv-MV

Update readme to add Maldives locale (dv-MV) in isMobilePhone documentation
[chore] squashed from #1820

Clean up validator and add trailing comma
[chore] fixed merge conflicts in #1784

feat: (isMobilePhone) Add Guyana mobile phone validation

Fix linter errors
squashed commits and resolved merge conflict for #1780

Add Turkmenistan validation regax

Update README.md to include Turkmenistan (tk-Tm)

Add test cases for tk-TM

add missing comma for isMobilePhone.js

add missing commas for test/validators.js
Added new condition for Botswana

New regex for Botswana numbers

Phone number information was found from the following sources:
- https://www.howtocallabroad.com/botswana/
- https://countrycode.org/botswana

Updated README.md to include en-BW

Included the new case for Botswana (en-BW)

Added test cases for isMobilePhone en-BW

Added some test cases to check length for the phone number & area code pattern.

Changed regex for BW

Fixed the pattern for Botswana mobile phone numbers and edited the test cases. I followed the convention from Table 8 of the national numbering plan document and the mobile number pattern on the Wiki page.

Update validators.js

Oops! Looks like the file didn't update with some of my modified test cases - my apologies!
Add isMobilePhone test for ar-PS

Add ar-PS to isMobilePhone readme

Correct ar-PS validation

Update ar-PS isMobible tests
* Solve issue with wrong validation on El Salvador mobile phones
* update tests accordingly

in order to define the right regEx, the following site was
consulted.

https://www.siget.gob.sv/guia-de-servicios/consulta-el-plan-de-numeracion/numeros-moviles/
@profnandaa profnandaa merged commit 45901ec into master Oct 31, 2021
@profnandaa profnandaa deleted the chore/fix-merge-conflicts branch October 31, 2021 12:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants