diff --git a/editor.php b/editor.php index ed8c024..2a3d2f4 100644 --- a/editor.php +++ b/editor.php @@ -1,6 +1,7 @@ @@ -67,40 +68,40 @@ h2 {color: rgba(0,198,255,0.7)} -
Click icons
for help &
usage info
+
-

server

- Server name, OS & IP:
+

+


- Root:
+


- ICEcoder root:
+


- PHP version:
+


- Date & time:
+


-

your device

- Browser:
+

+


- Your IP:
+


-

files

- Last 10 files opened:
+

+


'; + echo '
'.$t['none'].'


'; } else { $fileFolderName = str_replace("\\","/",$last10FilesArray[$i]); // Get extension (prefix 'ext-' to prevent invalid classes from extensions that begin with numbers) @@ -133,18 +134,17 @@ h2 {color: rgba(0,198,255,0.7)}
-

test suite

- Run unit tests:
- Run unit tests
+

+
+
-

dev mode

- Status:
- Using [?] +

+ :
+ [?]
@@ -230,7 +230,7 @@ function createNewCMInstance(num) { top.ICEcoder.updateNestingIndicator(); if (top.ICEcoder.findMode) { top.ICEcoder.results.splice(top.ICEcoder.findResult,1); - top.document.getElementById('results').innerHTML = top.ICEcoder.results.length + " results"; + top.document.getElementById('results').innerHTML = top.ICEcoder.results.length + " "; top.ICEcoder.findMode = false; } var filepath = top.ICEcoder.openFiles[top.ICEcoder.selectedTab-1]; diff --git a/files.php b/files.php index 191b4e4..1897a1c 100644 --- a/files.php +++ b/files.php @@ -1,6 +1,7 @@ -
-
+
+
diff --git a/index.php b/index.php index f22d0a5..a6ab92f 100644 --- a/index.php +++ b/index.php @@ -1,6 +1,7 @@ -1 && !strpos($icv,"beta") && str_replace(" beta","",$thisV) == $icv) {$thisV-=0.1;}; if ($thisV<$icv) { - $updateMsg = ";top.ICEcoder.dataMessage('UPDATE INFO: ICEcoder v ".$icv." now available. (Your version is v ".$ICEcoder["versionNo"].").

Update now

".$icvI."');"; + $updateMsg = ";top.ICEcoder.dataMessage('".$t['UPDATE INFO'].": ICEcoder v ".$icv." ".$t['now available'].". (".$t['Your version is']." v ".$ICEcoder["versionNo"].").

".$t['Update now']."

".$icvI."');"; } } @@ -48,7 +49,7 @@ iceRoot = ""; window.onbeforeunload = function() { for(var i=1;i<=ICEcoder.savedPoints.length;i++) { if (ICEcoder.savedPoints[i-1]!=top.ICEcoder.getcMInstance(i).changeGeneration()) { - return "You have some unsaved changes."; + return "."; } } } @@ -96,7 +97,7 @@ window.onbeforeunload = function() {
- working... + ...
@@ -104,7 +105,7 @@ window.onbeforeunload = function() {
: 0" onMouseOver="top.ICEcoder.showHidePlugins('show')" onMouseOut="top.ICEcoder.showHidePlugins('hide')" onClick="top.ICEcoder.showHidePlugins('hide')">
Color Picker

+">Color Picker

+ / -
@@ -112,10 +113,10 @@ Color picker">Co <div id= - New File - New Folder + +
- Upload File(s) +
@@ -124,17 +125,17 @@ Color picker">Co <input type=">
- +
- Open - Copy - Duplicate - Delete + + + + - Rename +
- View Webpage +
Co echo '<a href=Zip It!'.PHP_EOL; }; ?> - Download +
- Properties +
@@ -152,44 +153,44 @@ Color picker">Co <div id=
@@ -205,11 +206,11 @@ Color picker">Co </div> <div id=
@@ -219,8 +220,8 @@ Color picker">Co <div id=
- - + +
'; @@ -230,20 +231,20 @@ Color picker">Co <div id=
-
Find
+
@@ -264,13 +265,13 @@ Color picker">Co <input type=">
-
+
> - 0" onClick="top.ICEcoder.codeAssistToggle()"> Code Assist + 0" onClick="top.ICEcoder.codeAssistToggle()">
-
Go to Line -
-
+
+
+
">
diff --git a/lang/english.php b/lang/english.php new file mode 100644 index 0000000..953bcdd --- /dev/null +++ b/lang/english.php @@ -0,0 +1,122 @@ + and HTML equivalents (eg &). Translations on right side. + +$text = array( + +// / [ROOT LEVEL] + + "editor" => + array( + "Click icons for..." => "Click icons
for help &
usage info", + "server" => "server", + "Server name, OS..." => "Server name, OS & IP:", + "Root" => "Root:", + "ICEcoder root" => "ICEcoder root:", + "PHP version" => "PHP version:", + "Date & time" => "Date & time:", + "your device" => "your device", + "Browser" => "Browser:", + "Your IP" => "Your IP:", + "files" => "files", + "Last 10 files..." => "Last 10 files opened:", + "none" => "[none]", + "test suite" => "test suite", + "Run unit tests" => "Run unit tests", + "dev mode" => "dev mode", + "Status" => "Status", + "Using" => "Using", + "You can switch..." => "You can switch dev mode on/off +in lib/config__settings.php", + "results" => "results" + + ), + + "files" => + array( + "Lock" => "Lock", + "Refresh" => "Refresh", + "ROOT" => "[ROOT]" + + ), + + "index" => + array( + "UPDATE INFO" => "UPDATE INFO", + "now available" => "now available", + "Your version is" => "Your version is", + "Update now" => "Update now", + "You have some..." => "You have some unsaved changes", + "working" => "working", + "Color picker" => "Color picker", + "New File" => "New File", + "New Folder" => "New Folder", + "Upload File(s)" => "Upload File(s)", + "Paste" => "Paste", + "Open" => "Open", + "Copy" => "Copy", + "Duplicate" => "Duplicate", + "Delete" => "Delete", + "Rename" => "Rename", + "View Webpage" => "View Webpage", + "Download" => "Download", + "Properties" => "Properties", + "File" => "File", + "Edit" => "Edit", + "Remote" => "Remote", + "Help" => "Help", + "Save" => "Save", + "Save As" => "Save As", + "Live Preview" => "Live Preview", + "Upload" => "Upload", + "Zip" => "Zip", + "Print" => "Print", + "Fullscreen toggle" => "Fullscreen toggle", + "Logout" => "Logout", + "Undo" => "Undo", + "Redo" => "Redo", + "Indent more" => "Indent more", + "Indent less" => "Indent less", + "Autocomplete" => "Autocomplete", + "Comment/Uncomment" => "Comment/Uncomment", + "Jump to Definition" => "Jump to Definition", + "Manual" => "Manual", + "Shortcuts" => "Shortcuts", + "Settings" => "Settings", + "Search for selected" => "Search for selected", + "website" => "website", + "Close all tabs" => "Close all tabs", + "Alphabetize tabs" => "Alphabetize tabs", + "Find" => "Find", + "in" => "in", + "and" => "and", + "replace" => "replace", + "replace all" => "replace all", + "this document" => "this document", + "open documents" => "open documents", + "all files" => "all files", + "all filenames" => "all filenames", + "Turn on/off..." => "Turn on/off code assist", + "Code Assist" => "Code Assist", + "Go to Line" => "Go to Line", + "View" => "View", + "Bug reporting not active" => "Bug reporting not active" + ), + +// /LIB + + "login" => + array( + "set password" => "set password", + "login" => "login", + "To disable registration..." => "To disable registration mode, open the settings menu or open lib/config___settings.php and change enableRegistration to false then reload this page", + "Registration mode enabled" => "Registration mode enabled", + "auto-check for updates" => "auto-check for updates", + "To put into..." => "To put into multi-user mode, open the settings menu or open lib/config___settings.php and change multiUser to true then reload this page", + "multi-user" => "multi-user" + ) +); +?> \ No newline at end of file diff --git a/lib/config___settings.php b/lib/config___settings.php index 8ec579f..9e1d7e5 100644 --- a/lib/config___settings.php +++ b/lib/config___settings.php @@ -9,6 +9,6 @@ $ICEcoderSettings = array( "loginRequired" => true, "multiUser" => false, "lineEnding" => "\n", - "enableRegistration" => true + "enableRegistration" => false ); ?> \ No newline at end of file diff --git a/lib/get-branch.php b/lib/get-branch.php index c64bafb..eebf766 100644 --- a/lib/get-branch.php +++ b/lib/get-branch.php @@ -119,7 +119,7 @@ foreach($finalArray as $entry) { if($_SESSION['bannedFiles'][$i] != "" && strpos($entry,$_SESSION['bannedFiles'][$i])!==false) {$canAdd = false;} } if ("/".$entry == $ICEcoderDir) { - $canAdd = false; + //$canAdd = false; } if ($entry != "." && $entry != ".." && $canAdd) { is_dir($docRoot.$iceRoot.$location."/".$entry) diff --git a/lib/login.php b/lib/login.php index 0a33529..6021901 100644 --- a/lib/login.php +++ b/lib/login.php @@ -1,6 +1,7 @@ @@ -27,17 +28,17 @@ echo $ICEcoder["password"] == "" && !$ICEcoder["multiUser"] ? "Setup" : "Login";


'.PHP_EOL;};?>

- " class="button"> + " class="button"> Registration mode enabled
'; + echo '
'.$t['Registration mode enabled'].'
'; } ?> auto-check for updates
'; + echo '
'.$t['auto-check for updates'].'
'; } - if (!$ICEcoder["multiUser"]) { echo '
multi-user?
';}; + if (!$ICEcoder["multiUser"]) { echo '
'.$t['multi-user'].'?
';}; ?> "> diff --git a/lib/settings.php b/lib/settings.php index 6739faf..9879c2c 100644 --- a/lib/settings.php +++ b/lib/settings.php @@ -39,6 +39,9 @@ If ($ICEcoderUserSettings["versionNo"] != $ICEcoderSettings["versionNo"]) { // Join ICEcoder settings and user settings together to make our final ICEcoder array $ICEcoder = $ICEcoderSettings + $ICEcoderUserSettings; +// Include language file +include(dirname(__FILE__)."/../lang/english.php"); + // Login not required or we're in demo mode and have password set in our settings, log us straight in if ((!$ICEcoder['loginRequired'] || $ICEcoder['demoMode']) && $ICEcoder['password']!="") {$_SESSION['loggedIn']=true;}; $demoMode = $ICEcoder['demoMode'];