From 7d7a5be1d1964d133b5bbd4aad67f97de99f9d5d Mon Sep 17 00:00:00 2001 From: Trial97 Date: Mon, 25 Oct 2021 14:56:24 +0300 Subject: [PATCH] Updated libphonenumber library --- engine/dynamicdp.go | 10 ---------- go.mod | 3 +-- go.sum | 4 ++-- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/engine/dynamicdp.go b/engine/dynamicdp.go index 043e4e7bc..0b79548a4 100644 --- a/engine/dynamicdp.go +++ b/engine/dynamicdp.go @@ -19,8 +19,6 @@ import ( "fmt" "github.com/nyaruka/phonenumbers" - "golang.org/x/text/language" - "golang.org/x/text/language/display" "github.com/cgrates/birpc/context" "github.com/cgrates/cgrates/config" @@ -193,14 +191,6 @@ func (dDP *libphonenumberDP) fieldAsInterface(fldPath []string) (val interface{} if err != nil { utils.Logger.Warning(fmt.Sprintf("Received error: <%+v> when getting GeoLocation for number %+v", err, dDP.pNumber)) } - if geoLocation == utils.EmptyString { // until https://github.com/nyaruka/phonenumbers/issues/100 is fixed - var reg language.Region - if reg, err = language.ParseRegion(regCode); err != nil { - utils.Logger.Warning(fmt.Sprintf("Received error: <%+v> when converting region in GeoLocation for number %+v", err, dDP.pNumber)) - } else { - geoLocation = display.English.Regions().Name(reg) - } - } val = geoLocation case "Carrier": carrier, err := phonenumbers.GetCarrierForNumber(dDP.pNumber, phonenumbers.GetRegionCodeForNumber(dDP.pNumber)) diff --git a/go.mod b/go.mod index 6efe943e0..574cfdbb0 100644 --- a/go.mod +++ b/go.mod @@ -45,7 +45,7 @@ require ( github.com/miekg/dns v1.1.44-0.20210927135021-1630ffe2ca11 github.com/nats-io/nats-server/v2 v2.2.6 // indirect github.com/nats-io/nats.go v1.11.0 - github.com/nyaruka/phonenumbers v1.0.72 + github.com/nyaruka/phonenumbers v1.0.73 github.com/peterh/liner v1.2.1 github.com/pierrec/lz4 v2.6.0+incompatible // indirect github.com/rivo/uniseg v0.2.0 // indirect @@ -61,7 +61,6 @@ require ( golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6 golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 // indirect - golang.org/x/text v0.3.7 golang.org/x/tools v0.1.6 // indirect google.golang.org/api v0.36.0 google.golang.org/genproto v0.0.0-20210111234610-22ae2b108f89 // indirect diff --git a/go.sum b/go.sum index ec84c91e9..fa59f3201 100644 --- a/go.sum +++ b/go.sum @@ -408,8 +408,8 @@ github.com/nats-io/nkeys v0.3.0 h1:cgM5tL53EvYRU+2YLXIK0G2mJtK12Ft9oeooSZMA2G8= github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4= github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/nyaruka/phonenumbers v1.0.72 h1:l1ClBSmRpEN6lfp28emOGPk7nzcuZ1hgWLtWk5lZXpM= -github.com/nyaruka/phonenumbers v1.0.72/go.mod h1:DTw5PBWllLZuh8TwMfgiC+g3+4wmowrsO+4HhnSENkc= +github.com/nyaruka/phonenumbers v1.0.73 h1:bP2WN8/NUP8tQebR+WCIejFaibwYMHOaB7MQVayclUo= +github.com/nyaruka/phonenumbers v1.0.73/go.mod h1:3aiS+PS3DuYwkbK3xdcmRwMiPNECZ0oENH8qUT1lY7Q= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=