switch back changes
Dieser Commit ist enthalten in:
Ursprung
1a32093344
Commit
5f10f39719
2 geänderte Dateien mit 17 neuen und 20 gelöschten Zeilen
|
@ -4,9 +4,7 @@
|
||||||
<option name="autoReloadType" value="ALL" />
|
<option name="autoReloadType" value="ALL" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="d5f54382-616d-41b2-b8f9-53d04e37d644" name="Changes" comment="init">
|
<list default="true" id="d5f54382-616d-41b2-b8f9-53d04e37d644" name="Changes" comment="first version">
|
||||||
<change afterPath="$PROJECT_DIR$/go.mod" afterDir="false" />
|
|
||||||
<change afterPath="$PROJECT_DIR$/thousands.go" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
|
@ -54,7 +52,8 @@
|
||||||
</component>
|
</component>
|
||||||
<component name="VcsManagerConfiguration">
|
<component name="VcsManagerConfiguration">
|
||||||
<MESSAGE value="init" />
|
<MESSAGE value="init" />
|
||||||
<option name="LAST_COMMIT_MESSAGE" value="init" />
|
<MESSAGE value="first version" />
|
||||||
|
<option name="LAST_COMMIT_MESSAGE" value="first version" />
|
||||||
</component>
|
</component>
|
||||||
<component name="VgoProject">
|
<component name="VgoProject">
|
||||||
<settings-migrated>true</settings-migrated>
|
<settings-migrated>true</settings-migrated>
|
||||||
|
|
30
thousands.go
30
thousands.go
|
@ -30,30 +30,29 @@ func Separate(Number interface{}, language ...string) (string, error) {
|
||||||
case "de":
|
case "de":
|
||||||
|
|
||||||
formattedNumber = strings.ReplaceAll(formattedNumber, ",", ".")
|
formattedNumber = strings.ReplaceAll(formattedNumber, ",", ".")
|
||||||
numberLength := len(formattedNumber)
|
|
||||||
|
|
||||||
dec := ""
|
dec := ""
|
||||||
|
|
||||||
if strings.Index(formattedNumber, ".") != -1 {
|
if strings.Index(formattedNumber, ".") != -1 {
|
||||||
dec = formattedNumber[strings.Index(formattedNumber, ".")+1 : numberLength]
|
dec = formattedNumber[strings.Index(formattedNumber, ".")+1 : len(formattedNumber)]
|
||||||
formattedNumber = formattedNumber[0:strings.Index(formattedNumber, ".")]
|
formattedNumber = formattedNumber[0:strings.Index(formattedNumber, ".")]
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for i := 0; i <= numberLength; i = i + 4 {
|
for i := 0; i <= len(formattedNumber); i = i + 4 {
|
||||||
|
|
||||||
a := formattedNumber[0 : numberLength-i]
|
a := formattedNumber[0 : len(formattedNumber)-i]
|
||||||
b := formattedNumber[numberLength-i : numberLength]
|
b := formattedNumber[len(formattedNumber)-i : len(formattedNumber)]
|
||||||
formattedNumber = a + "." + b
|
formattedNumber = a + "." + b
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if formattedNumber[0:1] == "." {
|
if formattedNumber[0:1] == "." {
|
||||||
formattedNumber = formattedNumber[1:numberLength]
|
formattedNumber = formattedNumber[1:len(formattedNumber)]
|
||||||
}
|
}
|
||||||
|
|
||||||
if formattedNumber[numberLength-1:numberLength] == "." {
|
if formattedNumber[len(formattedNumber)-1:len(formattedNumber)] == "." {
|
||||||
formattedNumber = formattedNumber[0 : numberLength-1]
|
formattedNumber = formattedNumber[0 : len(formattedNumber)-1]
|
||||||
}
|
}
|
||||||
|
|
||||||
if dec != "" {
|
if dec != "" {
|
||||||
|
@ -65,30 +64,29 @@ func Separate(Number interface{}, language ...string) (string, error) {
|
||||||
case "en":
|
case "en":
|
||||||
|
|
||||||
formattedNumber = strings.ReplaceAll(formattedNumber, ",", "")
|
formattedNumber = strings.ReplaceAll(formattedNumber, ",", "")
|
||||||
numberLength := len(formattedNumber)
|
|
||||||
|
|
||||||
dec := ""
|
dec := ""
|
||||||
|
|
||||||
if strings.Index(formattedNumber, ".") != -1 {
|
if strings.Index(formattedNumber, ".") != -1 {
|
||||||
dec = formattedNumber[strings.Index(formattedNumber, ".")+1 : numberLength]
|
dec = formattedNumber[strings.Index(formattedNumber, ".")+1 : len(formattedNumber)]
|
||||||
formattedNumber = formattedNumber[0:strings.Index(formattedNumber, ".")]
|
formattedNumber = formattedNumber[0:strings.Index(formattedNumber, ".")]
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for i := 0; i <= numberLength; i = i + 4 {
|
for i := 0; i <= len(formattedNumber); i = i + 4 {
|
||||||
|
|
||||||
a := formattedNumber[0 : numberLength-i]
|
a := formattedNumber[0 : len(formattedNumber)-i]
|
||||||
b := formattedNumber[numberLength-i : numberLength]
|
b := formattedNumber[len(formattedNumber)-i : len(formattedNumber)]
|
||||||
formattedNumber = a + "," + b
|
formattedNumber = a + "," + b
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if formattedNumber[0:1] == "," {
|
if formattedNumber[0:1] == "," {
|
||||||
formattedNumber = formattedNumber[1:numberLength]
|
formattedNumber = formattedNumber[1:len(formattedNumber)]
|
||||||
}
|
}
|
||||||
|
|
||||||
if formattedNumber[numberLength-1:numberLength] == "," {
|
if formattedNumber[len(formattedNumber)-1:len(formattedNumber)] == "," {
|
||||||
formattedNumber = formattedNumber[0 : numberLength-1]
|
formattedNumber = formattedNumber[0 : len(formattedNumber)-1]
|
||||||
}
|
}
|
||||||
|
|
||||||
if dec != "" {
|
if dec != "" {
|
||||||
|
|
Laden …
In neuem Issue referenzieren