Skip to content

Commit b2b2b7b

Browse files
abhi18avabhi18av
committed
the multiple push and pull is working fine now
1 parent 03c989c commit b2b2b7b

File tree

5 files changed

+91
-19
lines changed

5 files changed

+91
-19
lines changed

‎_dev/.devnagri.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ GlobalPreferenceInCaseOfMergeConflict: devnagri
44
ProjectKey: 25b8d9d922b61aa445c0802e09a68eee
55
RootFolder: langs
66
SourceLanguage: en
7+
Extension : xml
78
TargetLanguages:
89
- hi
910
- pa

‎_dev/en/CallingPapaPro1.xml ‎_dev/en/strings.xml

File renamed without changes.

‎_dev/pull_multiple.go

+18-17
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package main
33
import (
44
"encoding/base64"
55
"fmt"
6-
"io/ioutil"
76
// "io/ioutil"
87
"log"
98
"os"
@@ -73,14 +72,14 @@ func saveResponseAndConvert() {
7372
//x := "PCEtLSBUcmFuc2xhdGVkIEJ5IERldm5hZ3JpIC0tPgo8IS0tIGh0dHA6Ly9kZXZuYWdyaS5jb20gLS0+CjxyZXNvdXJjZXMgdG9vbHM6aWdub3JlPSJFeHRyYVRyYW5zbGF0aW9uIiB4bWxuczp0b29scz0iaHR0cDovL3NjaGVtYXMuYW5kcm9pZC5jb20vdG9vbHMiPgogICAgPHN0cmluZyBuYW1lPSJhcHBfbmFtZSI+PC9zdHJpbmc+CiAgICA8c3RyaW5nIG5hbWU9ImhpbnRfYWN0dWFsIj48L3N0cmluZz4KIDwvcmVzb3VyY2VzPg=="
7473
//decodeBase64(x)
7574

76-
dat, _ := ioutil.ReadFile("temp.txt")
77-
datString := string(dat)
75+
//dat, _ := ioutil.ReadFile("temp.txt")
76+
//datString := string(dat)
7877
//fmt.Println("String Length : ", len(datString))
7978

80-
content := datString[1:(len(datString) - 1)]
79+
//content := datString[1:(len(datString) - 1)]
8180
//fmt.Println(content)
8281

83-
fileContent := decodeBase64(content)
82+
//fileContent := decodeBase64(content)
8483
//fmt.Println(fileContent)
8584

8685
//fmt.Println("<<< Reading temp file now >>>")
@@ -94,24 +93,26 @@ func saveResponseAndConvert() {
9493
fieldValue := viper.GetStringSlice("TargetLanguages") // returns string
9594
fmt.Println(fieldValue)
9695

97-
//TODO: Make the << hi >> dir
98-
if _, err := os.Stat("./values-hi"); os.IsNotExist(err) {
99-
os.Mkdir("./values-hi", os.ModePerm)
100-
}
96+
/*
97+
//TODO: Make the << hi >> dir
98+
if _, err := os.Stat("./values-hi"); os.IsNotExist(err) {
99+
os.Mkdir("./values-hi", os.ModePerm)
100+
}
101101
102-
//TODO: Store the content of temp into the actual file
102+
//TODO: Store the content of temp into the actual file
103103
104-
responseFile, err := os.Create("./values-hi/strings.xml")
104+
responseFile, err := os.Create("./values-hi/strings.xml")
105105
106-
if err != nil {
107-
log.Fatal("Cannot create file", err)
108-
}
109-
defer responseFile.Close()
106+
if err != nil {
107+
log.Fatal("Cannot create file", err)
108+
}
109+
defer responseFile.Close()
110110
111-
_, err = responseFile.WriteString(fileContent)
111+
_, err = responseFile.WriteString(fileContent)
112112
113-
os.Remove("temp.txt")
113+
os.Remove("temp.txt")
114114
115+
*/
115116
fmt.Println("Done!")
116117

117118
}

‎_dev/push_multiple.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@ func main() {
2121

2222
var AccessToken = config.FetchAndValidate("AccessToken") // returns string
2323

24-
var RootFolder = config.FetchAndValidate("RootFolder") // returns string
24+
//var RootFolder = config.FetchAndValidate("RootFolder") // returns string
2525

26-
filename := "./" + RootFolder + "/strings.xml"
26+
var SourceLanguage = config.FetchAndValidate("SourceLanguage")
27+
28+
filename := "./" + SourceLanguage + "/strings.xml"
2729

2830
var Extension = config.FetchAndValidate("Extension")
2931

‎_dev/values-hi/strings.xml

+68
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
<!-- Translated By Devnagri -->
2+
<!-- http://devnagri.com -->
3+
<resources tools:ignore="ExtraTranslation" xmlns:tools="http://schemas.android.com/tools">
4+
<string name="app_name">carving calljdshajkagdhd</string>
5+
<string name="navigation_drawer_open">hgasdfjhgfdsajhgafj</string>
6+
<string name="navigation_drawer_close">dsajhgdfsajhgfdkajh</string>
7+
<string name="google_maps_key">gadsjhgdsafjhsa</string>
8+
<string name="hello_blank_fragment">herjhkjfdskfd</string>
9+
<string name="total_wallet_amount">sdkljdlksajlkas</string>
10+
<string name="pending_wallet_amount">nb nb n</string>
11+
<string name="have_promo_code">jhbbjhbjhbhjgb</string>
12+
<string name="min_order">jhki</string>
13+
<string name="apply">jknh,m</string>
14+
<string name="about_restaurant">hbjhbjhbhjb</string>
15+
<string name="rating">jhbbghjbghjgbh</string>
16+
<string name="message">jhbnhjbhjbjhb</string>
17+
<string name="crop__saving">n bmb mb mnb</string>
18+
<string name="crop__wait">bjhmbnbv n v</string>
19+
<string name="crop__pick_error">hgbvnvjnvn</string>
20+
<string name="crop__done">gvgjhnvbvnbv</string>
21+
<string name="crop__cancel">jhgdsjhgdjsag</string>
22+
<string name="loading">gdsajhfsajkhgdfa</string>
23+
<string name="facebook_app_id"></string>
24+
<string name="fb_login_protocol_scheme"></string>
25+
<string name="internet_not_connected"></string>
26+
<string name="login_register"></string>
27+
<string name="edit"></string>
28+
<string name="submit"></string>
29+
<string name="add_to_cart"></string>
30+
<string name="checkout"></string>
31+
<string name="your_cart"></string>
32+
<string name="select_quantity"></string>
33+
<string name="done"></string>
34+
<string name="update_cart"></string>
35+
<string name="no_geocoder_available"></string>
36+
<string name="fetch_address"></string>
37+
<string name="address_found"></string>
38+
<string name="no_address_found"></string>
39+
<string name="no_location_data_provided"></string>
40+
<string name="service_not_available"></string>
41+
<string name="invalid_lat_long_used"></string>
42+
<string name="permission_rationale"></string>
43+
<string name="permission_denied_explanation"></string>
44+
<string name="settings"></string>
45+
<string name="cancel"></string>
46+
<string name="no_data_found"></string>
47+
<string name="one_text"></string>
48+
<string name="one_two"></string>
49+
<string name="one_three"></string>
50+
<string name="one_four"></string>
51+
<string name="save"></string>
52+
<string name="take_a_photo"></string>
53+
<string name="choose_from_gallery"></string>
54+
<string name="saving_image"></string>
55+
<string name="preparing_card">asdafadfsfdas</string>
56+
<string name="no_storage_card">sdfsfdsdas</string>
57+
<string name="not_enough_space"></string>
58+
<string-array name="Cake">
59+
<item>Select Type Cake | Restaurants </item>
60+
<item>Restaurants </item>
61+
<item>Cake </item>
62+
</string-array>
63+
<string-array name="pictureselect">
64+
<item>Camera</item>
65+
<item>Gallery</item>
66+
<item>Cancel</item>
67+
</string-array>
68+
</resources>

0 commit comments

Comments
 (0)