Skip to content

Commit 187821b

Browse files
copoercopoer
committed
Removed auto /*LANG*/, Added more languages
1 parent d54fdaa commit 187821b

File tree

80 files changed

+1781
-142
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+1781
-142
lines changed

‎apps/BLEcontroller/app.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ const SocketsMenu = new State({
295295
const startEnd = status => status ? "start" : "end";
296296

297297
/* translate status into english */
298-
const onOff= status => status ? "on" : /*LANG*/"off";
298+
const onOff= status => status ? "on" : "off";
299299

300300

301301
/* create watching functions that will change the global

‎apps/a_clock_timer/app.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ function countDown() {
5353
g.reset().clearRect(0, 76, 44+44, g.getHeight()/2+6);
5454

5555
g.setFontAlign(0, -1, 0);
56-
g.setFont("6x8").drawString(/*LANG*/"Timer", 44, g.getHeight()/2-20);
56+
g.setFont("6x8").drawString("Timer", 44, g.getHeight()/2-20);
5757
g.setFont("Michroma16").drawString(timeToString(timervalue), 44, g.getHeight()/2-10);
5858

5959
if (timervalue <= 0) {

‎apps/about/app-bangle1.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/about/app-bangle2.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/activepedom/app.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
g.setFont("6x8", 2);
109109
g.setColor(1,1,1);
110110
require("graph").drawLine(g, steps, {
111-
//title: /*LANG*/"Steps",
111+
//title: "Steps",
112112
axes : true,
113113
gridy : gridyValue,
114114
y : 60, //offset on screen
@@ -118,7 +118,7 @@
118118
// show steps and duration of the chart
119119
g.setFont("6x8", 2);
120120
g.setColor(0,1,0);
121-
g.drawString(/*LANG*/"steps", 30, 24);
121+
g.drawString("steps", 30, 24);
122122
g.drawString(stepsLastEntry, 30, 44);
123123
g.drawString((history/3600000) + " hrs", 30, 64);
124124

‎apps/activepedom/widget.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
'stepGoal' : 10000,
7070
'stepLength' : 75,
7171
'lineOne' : "Distance",
72-
'lineTwo' : /*LANG*/"Steps",
72+
'lineTwo' : "Steps",
7373
};
7474
if (!settings) { loadSettings(); }
7575
return (key in settings) ? settings[key] : DEFAULTS[key];
@@ -169,15 +169,15 @@
169169
if (active == 1) g.setColor(0x07E0); //green
170170
else g.setColor(0xFFFF); //white
171171
g.setFont("6x8", 2);
172-
if (setting('lineOne') == /*LANG*/'Steps') {
172+
if (setting('lineOne') == 'Steps') {
173173
g.drawString(kFormatterSteps(stepsCounted),this.x+1,this.y); //first line, big number, steps
174174
}
175175
if (setting('lineOne') == 'Distance') {
176176
g.drawString(distance.toFixed(2),this.x+1,this.y); //first line, big number, distance
177177
}
178178
g.setFont("6x8", 1);
179179
g.setColor(0xFFFF); //white
180-
if (setting('lineTwo') == /*LANG*/'Steps') {
180+
if (setting('lineTwo') == 'Steps') {
181181
g.drawString(stepsCounted,this.x+1,this.y+14); //second line, small number, steps
182182
}
183183
if (setting('lineTwo') == 'Distance') {

‎apps/alarm/app.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ function showMainMenu() {
3939
};
4040
alarms.forEach((alarm,idx)=>{
4141
if (alarm.timer) {
42-
txt = /*LANG*/"TIMER "+(alarm.on?/*LANG*/"on ":/*LANG*//*LANG*/"off ")+formatMins(alarm.timer);
42+
txt = /*LANG*/"TIMER "+(alarm.on?/*LANG*/"on ":/*LANG*/"off ")+formatMins(alarm.timer);
4343
} else {
44-
txt = /*LANG*/"ALARM "+(alarm.on?/*LANG*/"on ":/*LANG*//*LANG*/"off ")+formatTime(alarm.hr);
44+
txt = /*LANG*/"ALARM "+(alarm.on?/*LANG*/"on ":/*LANG*/"off ")+formatTime(alarm.hr);
4545
if (alarm.rp) txt += /*LANG*/" (repeat)";
4646
}
4747
menu[txt] = function() {
@@ -82,7 +82,7 @@ function editAlarm(alarmIndex) {
8282
},
8383
/*LANG*/'Enabled': {
8484
value: en,
85-
format: v=>v?"On":/*LANG*/"Off",
85+
format: v=>v?"On":"Off",
8686
onchange: v=>en=v
8787
},
8888
/*LANG*/'Repeat': {
@@ -147,7 +147,7 @@ function editTimer(alarmIndex) {
147147
},
148148
/*LANG*/'Enabled': {
149149
value: en,
150-
format: v=>v?/*LANG*/"On":/*LANG*//*LANG*/"Off",
150+
format: v=>v?/*LANG*/"On":/*LANG*/"Off",
151151
onchange: v=>en=v
152152
}
153153
};

‎apps/android/boot.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
},
3030
// {t:"musicstate", state:"play/pause",position,shuffle,repeat}
3131
"musicstate" : function() {
32-
require("messages").pushMessage({t:"modify",id:"music",title:/*LANG*/"Music",state:event.state});
32+
require("messages").pushMessage({t:"modify",id:"music",title:"Music",state:event.state});
3333
},
3434
// {t:"musicinfo", artist,album,track,dur,c(track count),n(track num}
3535
"musicinfo" : function() {
36-
require("messages").pushMessage(Object.assign(event, {t:"modify",id:"music",title:/*LANG*/"Music"}));
36+
require("messages").pushMessage(Object.assign(event, {t:"modify",id:"music",title:"Music"}));
3737
},
3838
// {"t":"call","cmd":"incoming/end","name":"Bob","number":"12421312"})
3939
"call" : function() {
@@ -63,7 +63,7 @@
6363
// Music control
6464
Bangle.musicControl = cmd => {
6565
// play/pause/next/previous/volumeup/volumedown
66-
gbSend({ t: /*LANG*/"music", n:cmd });
66+
gbSend({ t: "music", n:cmd });
6767
};
6868
// Message response
6969
Bangle.messageResponse = (msg,response) => {

‎apps/antonclk/app.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ require('Storage').writeJSON(SETTINGSFILE, {
3737
secondsColoured: true,
3838
secondsWithColon: true,
3939
dateOnMain: "Long", // "Short", "Long", "ISO8601"
40-
dateOnSecs: "Year", // "No", /*LANG*/"Year", "Weekday", LEGACY: true/false
40+
dateOnSecs: "Year", // "No", "Year", "Weekday", LEGACY: true/false
4141
weekDay: true,
4242
calWeek: true,
4343
upperCase: true,
@@ -60,15 +60,15 @@ function loadSettings() {
6060
secondsColoured = def(settings.secondsColoured, true);
6161
secondsWithColon = def(settings.secondsWithColon, true);
6262
dateOnMain = def(settings.dateOnMain, "Long");
63-
dateOnSecs = def(settings.dateOnSecs, /*LANG*/"Year");
63+
dateOnSecs = def(settings.dateOnSecs, "Year");
6464
weekDay = def(settings.weekDay, true);
6565
calWeek = def(settings.calWeek, false);
6666
upperCase = def(settings.upperCase, true);
6767
vectorFont = def(settings.vectorFont, false);
6868

6969
// Legacy
7070
if (dateOnSecs === true)
71-
dateOnSecs = /*LANG*/"Year";
71+
dateOnSecs = "Year";
7272
if (dateOnSecs === false)
7373
dateOnSecs = "No";
7474
}
@@ -153,15 +153,15 @@ function draw() {
153153
var md;
154154
var yearfirst;
155155
if (dateStr2.match(/\d\d\d\d$/)) { // formatted date ends with year
156-
year = (dateOnSecs === /*LANG*/"Year" ? dateStr2.slice(-4) : require("locale").dow(date, 1));
156+
year = (dateOnSecs === "Year" ? dateStr2.slice(-4) : require("locale").dow(date, 1));
157157
md = dateStr2.slice(0, -4);
158158
if (!md.endsWith(".")) // keep separator before the year only if it is a dot (31.12. but 31/12)
159159
md = md.slice(0, -1);
160160
yearfirst = false;
161161
} else { // formatted date begins with year
162162
if (!dateStr2.match(/^\d\d\d\d/)) // if year position cannot be detected...
163163
dateStr2 = isoStr(date); // ...use ISO date format instead
164-
year = (dateOnSecs === /*LANG*/"Year" ? dateStr2.slice(0, 4) : require("locale").dow(date, 1));
164+
year = (dateOnSecs === "Year" ? dateStr2.slice(0, 4) : require("locale").dow(date, 1));
165165
md = dateStr2.slice(5); // never keep separator directly after year
166166
yearfirst = true;
167167
}

‎apps/banglerun/app.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/breath/app.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ function btn3Pressed() {
191191
if (settings.vibrate == "forward")
192192
settings.vibrate = "backward";
193193
else if (settings.vibrate == "backward")
194-
settings.vibrate = /*LANG*/"off";
195-
else if (settings.vibrate == /*LANG*/"off")
194+
settings.vibrate = "off";
195+
else if (settings.vibrate == "off")
196196
settings.vibrate = "forward";
197197
}
198198
else if(status == 5){

‎apps/bthrm/boot.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@
503503
if (settings.startWithHrm){
504504

505505
Bangle.setHRMPower = function(isOn, app) {
506-
log("setHRMPower for " + app + ": " + (isOn?"on":/*LANG*/"off"));
506+
log("setHRMPower for " + app + ": " + (isOn?"on":"off"));
507507
if (settings.enabled){
508508
Bangle.setBTHRMPower(isOn, app);
509509
}

‎apps/bthrv/app.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ function draw(y, hrv) {
5858
}
5959

6060
g.setRotation(3);
61-
g.setFontVector(12).drawString(/*LANG*/"Reset",g.getHeight()/2, g.getWidth()-10);
61+
g.setFontVector(12).drawString("Reset",g.getHeight()/2, g.getWidth()-10);
6262
g.setRotation(0);
6363
}
6464

‎apps/circlesclock/app.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ function isCircleEnabled(type) {
227227

228228
function getCircleColor(type) {
229229
const pos = getCirclePosition(type);
230-
const color = settings["circle" + (pos + 1) + /*LANG*/"color"];
230+
const color = settings["circle" + (pos + 1) + "color"];
231231
if (color && color != "") return color;
232232
}
233233

‎apps/circlesclock/settings.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
},
4545
/*LANG*/'show widgets': {
4646
value: "showWidgets" in settings ? settings.showWidgets : false,
47-
format: () => (settings.showWidgets ? /*LANG*/'Yes' : 'No'),
47+
format: () => (settings.showWidgets ? 'Yes' : 'No'),
4848
onchange: x => save('showWidgets', x),
4949
},
5050
/*LANG*/'weather circle': {
@@ -167,7 +167,7 @@
167167
},
168168
/*LANG*/'colorize icon': {
169169
value: colorizeIconKey in settings ? settings[colorizeIconKey] : false,
170-
format: () => (settings[colorizeIconKey] ? /*LANG*/'Yes' : 'No'),
170+
format: () => (settings[colorizeIconKey] ? 'Yes' : 'No'),
171171
onchange: x => save(colorizeIconKey, x),
172172
},
173173
};

‎apps/cliclockJS2Enhanced/app.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ var lasty = 0;
1616
var lastx = 0;
1717

1818
if (settings.HID=="kbmedia") {
19-
profile = /*LANG*/'Music';
19+
profile = 'Music';
2020
sendHid = function (code, cb) {
2121
try {
2222
NRF.sendHIDReport([1,code], () => {
@@ -57,29 +57,29 @@ if (next) {
5757
if(lasty > 40){
5858
writeLine('Down', 3);
5959
// setTimeout(drawApp, 1000);
60-
// Bluetooth.println(JSON.stringify({t:/*LANG*/"music", n:"volumedown"}));
60+
// Bluetooth.println(JSON.stringify({t:"music", n:"volumedown"}));
6161
down(() => {});
6262
}
6363
else if(lasty < -40){
6464
writeLine('Up', 3);
6565
// setTimeout(drawApp, 1000);
66-
//Bluetooth.println(JSON.stringify({t:/*LANG*/"music", n:"volumeup"}));
66+
//Bluetooth.println(JSON.stringify({t:"music", n:"volumeup"}));
6767

6868
up(() => {});
6969
} else if(lastx < -40){
7070
writeLine('Prev', 3);
7171
// setTimeout(drawApp, 1000);
72-
// Bluetooth.println(JSON.stringify({t:/*LANG*/"music", n:"previous"}));
72+
// Bluetooth.println(JSON.stringify({t:"music", n:"previous"}));
7373
prev(() => {});
7474
} else if(lastx > 40){
7575
writeLine('Next', 3);
7676
// setTimeout(drawApp, 1000);
77-
// Bluetooth.println(JSON.stringify({t:/*LANG*/"music", n:"next"}));
77+
// Bluetooth.println(JSON.stringify({t:"music", n:"next"}));
7878
next(() => {});
7979
} else if(lastx==0 && lasty==0){
8080
writeLine('play/pause', 3);
8181
//setTimeout(drawApp, 1000);
82-
// Bluetooth.println(JSON.stringify({t:/*LANG*/"music", n:"play"}));
82+
// Bluetooth.println(JSON.stringify({t:"music", n:"play"}));
8383

8484
toggle(() => {});
8585
}

‎apps/clicompleteclk/app.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function setting(key) {
3535
'battery': true,
3636
'batteryLvl': 30,
3737
'weather': true,
38-
/*LANG*/'steps': true,
38+
'steps': true,
3939
'heartrate': true
4040
};
4141
return (key in settings) ? settings[key] : DEFAULTS[key];
@@ -45,7 +45,7 @@ function setting(key) {
4545
let showBattery = setting('battery');
4646
let batteryWarnLevel = setting('batteryLvl');
4747
let showWeather = setting('weather');
48-
let showSteps = setting(/*LANG*/'steps');
48+
let showSteps = setting('steps');
4949
let showHeartRate = setting('heartrate');
5050

5151

0 commit comments

Comments
 (0)