Skip to content

Commit

Permalink
update i18n, clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
@cs0x7f
cs0x7f committed Aug 13, 2024
1 parent 4b79363 commit d65e1f9
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 33 deletions.
10 changes: 5 additions & 5 deletions src/js/lib/grouplib.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -807,9 +807,9 @@ var grouplib = (function(rn) {

SubgroupSolver.prototype.DissectionSolve = function(perm, minl, maxl, permCtx, solCallback) {
permCtx = permCtx || {};
var tt = performance.now();
var tt = $.now();
this.initTables();
DEBUG && console.log('[Subgroup Solver] finished init tables, tt=', performance.now() - tt);
DEBUG && console.log('[Subgroup Solver] finished init tables, tt=', $.now() - tt);
if (this.sgsG.isMember(perm) < 0) {
console.log('[Subgroup Solver] NOT A MEMBER OF G');
return;
Expand All @@ -830,7 +830,7 @@ var grouplib = (function(rn) {
prunTable1 = prunTable2;
pidx = this.clen;
}
DEBUG && console.log('[Subgroup Solver] finish init searching, prun value:', prunTable1[0][pidx], 'tt=', performance.now() - tt);
DEBUG && console.log('[Subgroup Solver] finish init searching, prun value:', prunTable1[0][pidx], 'tt=', $.now() - tt);
for (var depth = Math.max(minl, prunTable1[0][pidx]); depth <= maxl; depth++) {
var s1tot = 0;
var s2tot = 0;
Expand All @@ -850,7 +850,7 @@ var grouplib = (function(rn) {
}
return solCallback ? solCallback(solution) : solution;
});
DEBUG && console.log('[Subgroup Solver] ida ', s1tot + s2tot, 'node(s) checked at', depth, 'tt=', performance.now() - tt);
DEBUG && console.log('[Subgroup Solver] ida ', s1tot + s2tot, 'node(s) checked at', depth, 'tt=', $.now() - tt);
if (ret) {
return ret;
}
Expand Down Expand Up @@ -953,7 +953,7 @@ var grouplib = (function(rn) {
break;
}
}
DEBUG && console.log('[Subgroup Solver] dis ', s1tot + s2tot, 'node(s) checked at', depth, 'tt=', performance.now() - tt);
DEBUG && console.log('[Subgroup Solver] dis ', s1tot + s2tot, 'node(s) checked at', depth, 'tt=', $.now() - tt);
if (ret) {
break;
}
Expand Down
44 changes: 22 additions & 22 deletions src/js/scramble/scramble_444.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1239,7 +1239,7 @@ var scramble_444 = (function(Cnk, circle) {
var doneRaw = 1;
setPruning(Edge3Prun, 0, 0);
var bfsMoves = [1, 0, 2, 3, 5, 4, 6, 8, 7, 9, 10, 12, 11, 13, 14, 15, 16];
var start = performance.now();
var start = $.now();
while (done != 31006080) {
var inv = depth > 9;
var depm3 = depth % 3;
Expand Down Expand Up @@ -1307,7 +1307,7 @@ var scramble_444 = (function(Cnk, circle) {
}
}
++depth;
DEBUG && console.log('[scramble 444] edge3 pruning ', depth, done, performance.now() - start);
DEBUG && console.log('[scramble 444] edge3 pruning ', depth, done, $.now() - start);
}
}

Expand Down Expand Up @@ -1833,7 +1833,7 @@ var scramble_444 = (function(Cnk, circle) {
function $doSearch(obj) {
var MAX_LENGTH2, MAX_LENGTH3, ct, edge, eparity, fb, fbprun, index, length12, length123, p1SolsArr, prun, rl, rlprun, s2ct, s2rl, solcube, ud, udprun;
obj.solution = '';
var tt = performance.now();
var tt = $.now();
ud = $getsym(new Center1().fromCube(getCenter(obj.c), 0));
fb = $getsym(new Center1().fromCube(getCenter(obj.c), 1));
rl = $getsym(new Center1().fromCube(getCenter(obj.c), 2));
Expand All @@ -1851,8 +1851,8 @@ var scramble_444 = (function(Cnk, circle) {
}
}
p1SolsArr = obj.p1sols.array.slice();
var tt1 = performance.now() - tt;
DEBUG && console.log('[scramble 444] Phase 1 Done in', performance.now() - tt);
var tt1 = $.now() - tt;
DEBUG && console.log('[scramble 444] Phase 1 Done in', $.now() - tt);
p1SolsArr.sort(function(a, b) {
return a.value - b.value
});
Expand Down Expand Up @@ -1888,8 +1888,8 @@ var scramble_444 = (function(Cnk, circle) {
obj.arr2.sort(function(a, b) {
return a.value - b.value
});
DEBUG && console.log('[scramble 444] Phase 2 Done in', performance.now() - tt);
var tt2 = performance.now() - tt - tt1;
DEBUG && console.log('[scramble 444] Phase 2 Done in', $.now() - tt);
var tt2 = $.now() - tt - tt1;
index = 0;
MAX_LENGTH3 = 13;
do {
Expand Down Expand Up @@ -1920,8 +1920,8 @@ var scramble_444 = (function(Cnk, circle) {
++MAX_LENGTH3;
}
while (length123 == MAX_SEARCH_DEPTH);
DEBUG && console.log('[scramble 444] Phase 3 Done in', performance.now() - tt);
var tt3 = performance.now() - tt - tt1 - tt2;
DEBUG && console.log('[scramble 444] Phase 3 Done in', $.now() - tt);
var tt3 = $.now() - tt - tt1 - tt2;

solcube = new FullCube_4(obj.arr2[index]);
obj.length1 = solcube.length1;
Expand All @@ -1947,7 +1947,7 @@ var scramble_444 = (function(Cnk, circle) {
}
}
obj.solution = getMoveString(solcube);
DEBUG && console.log('[scramble 444] 3x3x3 Done in', performance.now() - tt);
DEBUG && console.log('[scramble 444] 3x3x3 Done in', $.now() - tt);
DEBUG && console.log('[scramble 444] Phase depths: ', [obj.length1, obj.length2, obj.length3, length333, tt1, tt2, tt3]);
return [obj.length1, obj.length2, obj.length3, length333, tt1, tt2, tt3];
}
Expand Down Expand Up @@ -2316,7 +2316,7 @@ var scramble_444 = (function(Cnk, circle) {

function init() {
init = nullMethod;
var tt = performance.now();
var tt = $.now();
DEBUG && console.log('[scramble 444] start initialization');
$clinit_Moves();
$clinit_Center1();
Expand All @@ -2325,28 +2325,28 @@ var scramble_444 = (function(Cnk, circle) {
$clinit_Edge3();
$clinit_CornerCube();
$clinit_FullCube_0();
DEBUG && console.log('[scramble 444] alloc tables', performance.now() - tt);
DEBUG && console.log('[scramble 444] alloc tables', $.now() - tt);
initSymMeta();
DEBUG && console.log('[scramble 444] initSymMeta', performance.now() - tt);
DEBUG && console.log('[scramble 444] initSymMeta', $.now() - tt);
Center1Raw2Sym = createArray(735471);
initCenter1Sym2Raw();
DEBUG && console.log('[scramble 444] initCenter1Sym2Raw', performance.now() - tt);
DEBUG && console.log('[scramble 444] initCenter1Sym2Raw', $.now() - tt);
initCenter1MoveTable();
DEBUG && console.log('[scramble 444] initCenter1MoveTable', performance.now() - tt);
DEBUG && console.log('[scramble 444] initCenter1MoveTable', $.now() - tt);
Center1Raw2Sym = null;
initCenter1Prun();
DEBUG && console.log('[scramble 444] initCenter1Prun', performance.now() - tt);
DEBUG && console.log('[scramble 444] initCenter1Prun', $.now() - tt);

initCenter2();
DEBUG && console.log('[scramble 444] initCenter2', performance.now() - tt);
DEBUG && console.log('[scramble 444] initCenter2', $.now() - tt);
initCenter3();
DEBUG && console.log('[scramble 444] initCenter3', performance.now() - tt);
DEBUG && console.log('[scramble 444] initCenter3', $.now() - tt);
initEdge3MvRot();
DEBUG && console.log('[scramble 444] initEdge3MvRot', performance.now() - tt);
DEBUG && console.log('[scramble 444] initEdge3MvRot', $.now() - tt);
initEdge3Sym2Raw();
DEBUG && console.log('[scramble 444] initEdge3Sym2Raw', performance.now() - tt);
DEBUG && console.log('[scramble 444] initEdge3Sym2Raw', $.now() - tt);
initEdge3Prun();
DEBUG && console.log('[scramble 444] initEdge3Prun', performance.now() - tt);
DEBUG && console.log('[scramble 444] initEdge3Prun', $.now() - tt);
searcher = new Search_4();
}

Expand Down Expand Up @@ -2446,7 +2446,7 @@ var scramble_444 = (function(Cnk, circle) {
if (chk != 0) {
console.log('[scramble 444] State Check Error!', chk, facelet);
}
var tt = performance.now();
var tt = $.now();
var data = $doSearch(searcher);
for (var j = 0; j < data.length; j++) {
avgs[j] = (avgs[j] || 0) + data[j];
Expand Down
4 changes: 2 additions & 2 deletions src/js/solver/kilominx.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ var klmsolver = (function() {

function init() {
init = $.noop;
var tt = performance.now();
var tt = $.now();
createMoveCube();

function setTwst4(arr, idx) {
Expand Down Expand Up @@ -350,7 +350,7 @@ var klmsolver = (function() {
initPhase1();
initPhase2();
initPhase3();
DEBUG && console.log('[kilo] init finished, tt=', performance.now() - tt);
DEBUG && console.log('[kilo] init finished, tt=', $.now() - tt);
}

var Phase1Move = [];
Expand Down
6 changes: 3 additions & 3 deletions src/lang/de-de.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ var PROPERTY_SCRLIM = 'Die Höhe des Scramble-Bereichs begrenzen';
var PROPERTY_SCRALIGN = 'Aurichtung des Scramble-Bereichs';
var PROPERTY_SCRALIGN_STR = 'mittig|links|rechts';
var PROPERTY_SCRWRAP = 'Scramble Wrap';
var PROPERTY_SCRWRAP_STR = 'Balanced|Normal';
var PROPERTY_SCRWRAP_STR = 'Ausgeglichen|Normal';
var PROPERTY_SCRNEUT = 'Farbneutral';
var PROPERTY_SCRNEUT_STR = 'Keine Seite|Eine Seite|Zwei Seiten|Sechs Seiten';
var PROPERTY_SCREQPR = 'Gleiche Wahrscheinlichkeiten bei Training-Scrambles anstelle von tatsächlichen Wahrscheinlichkeiten verwenden.';
Expand Down Expand Up @@ -57,7 +57,7 @@ var EXPORT_LOGOUTCFM = 'Bestätige Abmeldung?';
var EXPORT_LOGINAUTHED = 'Autorisiert<br>Daten werden geladen...';
var EXPORT_AEXPALERT = 'Mehr als %d Solves seit dem letzten Backup';
var EXPORT_WHICH = 'Es gibt %d Datei(en), welche soll(en) importiert werden?';
var EXPORT_WHICH_ITEM = '%s solve(s), uploaded at %t';
var EXPORT_WHICH_ITEM = '%s Solve(s), hochgeladen um %t';
var IMPORT_FINAL_CONFIRM = 'Dadurch werden alle lokale Daten überschrieben! Bestätigen, um Daten zu importieren?';
var BUTTON_SCRAMBLE = 'SCRA<br>MBLE';
var BUTTON_TOOLS = 'Werkzeuge';
Expand Down Expand Up @@ -150,7 +150,7 @@ var SCRAMBLE_LENGTH = 'Länge';
var SCRAMBLE_INPUT = 'Scramble(s) eingeben';
var SCRAMBLE_INPUTTYPE = 'Scramble-Art';
var PROPERTY_VRCSPEED = 'VRC Grundgeschwindigkeit (TPS)';
var PROPERTY_VRCORI = 'Virtual cube orientation';
var PROPERTY_VRCORI = 'Ausrichtung virtueller Cube';
var PROPERTY_VRCMP = 'Multi-Phase';
var PROPERTY_VRCMPS = 'Keine|CFOP|CF+OP|CFFFFOP|CFFFFOOPP|Roux';
var PROPERTY_GIIKERVRC = 'Virtuellen Giiker Cube zeigen';
Expand Down
2 changes: 1 addition & 1 deletion src/lang/langDet.php
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
$version = "2024.08.09";
$version = "2024.08.13";

function prefered_language($available_languages, $req_lang) {
if ($req_lang == "auto" && isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
Expand Down

0 comments on commit d65e1f9

Please sign in to comment.