Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
BlocksCAD
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
BlocksCAD
Commits
0f669a58
Commit
0f669a58
authored
Jun 01, 2016
by
Jennie Yoder
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more german translations.
parent
5473707d
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
162 additions
and
157 deletions
+162
-157
blockly/core/xml.js
blockly/core/xml.js
+10
-3
blockscad/blockscad.js
blockscad/blockscad.js
+6
-8
blockscad/msg/js/de.js
blockscad/msg/js/de.js
+135
-135
blockscad/storage.js
blockscad/storage.js
+2
-2
blockscad/viewer.js
blockscad/viewer.js
+1
-1
imgs/de/torus.svg
imgs/de/torus.svg
+8
-8
No files found.
blockly/core/xml.js
View file @
0f669a58
...
...
@@ -264,9 +264,16 @@ Blockly.Xml.domToWorkspace = function(workspace, xml) {
// read in default color information.
if
(
xmlChild
.
nodeName
.
toLowerCase
()
==
'
color
'
)
{
var
col
=
xmlChild
.
getAttribute
(
'
rgba
'
);
var
colA
=
col
.
split
(
'
,
'
);
Blockscad
.
setColor
(
colA
[
0
],
colA
[
1
],
colA
[
2
]);
found_color
=
true
;
if
(
col
==
"
undefined
"
)
{
// set color to default
found_color
=
true
;
Blockscad
.
setColor
(
255
,
128
,
255
);
}
else
{
var
colA
=
col
.
split
(
'
,
'
);
Blockscad
.
setColor
(
colA
[
0
],
colA
[
1
],
colA
[
2
]);
found_color
=
true
;
}
}
if
(
xmlChild
.
nodeName
.
toLowerCase
()
==
'
block
'
)
{
var
block
=
Blockly
.
Xml
.
domToBlock
(
workspace
,
xmlChild
);
...
...
blockscad/blockscad.js
View file @
0f669a58
...
...
@@ -629,7 +629,7 @@ Blockscad.readStlFile = function(evt) {
};
// Load Blockly's (and Blockscad's) language strings.
console
.
log
(
"
trying to include message strings
"
);
//
console.log("trying to include message strings");
document
.
write
(
'
<script src="blockly/msg/js/
'
+
BSUtils
.
LANG
+
'
.js"></script>
\n
'
);
document
.
write
(
'
<script src="blockscad/msg/js/
'
+
BSUtils
.
LANG
+
'
.js"></script>
\n
'
);
...
...
@@ -1813,7 +1813,7 @@ Blockscad.initLanguage = function() {
document
.
head
.
parentElement
.
setAttribute
(
'
dir
'
,
rtl
?
'
rtl
'
:
'
ltr
'
);
document
.
head
.
parentElement
.
setAttribute
(
'
lang
'
,
BSUtils
.
LANG
);
console
.
log
(
"
lang is:
"
,
BSUtils
.
LANG
);
//
console.log("lang is:",BSUtils.LANG);
// Sort languages alphabetically.
var
languages
=
[];
...
...
@@ -1855,12 +1855,10 @@ Blockscad.saveBlocksLocal = function() {
// don't save without a filename. Name isn't checked for quality.
// console.log("in SaveBlocksLocal with: ", blocks_filename);
if
(
blocks_filename
)
{
if
(
navigator
.
userAgent
.
indexOf
(
'
Safari
'
)
!=
-
1
&&
navigator
.
userAgent
.
indexOf
(
'
Chrome
'
)
==
-
1
)
{
console
.
log
(
"
found Safari
"
);
saveAs
(
blob
,
blocks_filename
+
"
.txt
"
);
}
else
saveAs
(
blob
,
blocks_filename
+
"
.xml
"
);
// if (navigator.userAgent.indexOf('Safari') != -1 && navigator.userAgent.indexOf('Chrome') == -1)
// {
// }
saveAs
(
blob
,
blocks_filename
+
"
.xml
"
);
// console.log("SAVED locally: setting needToSave to 0");
Blockscad
.
setNoSaveNeeded
();
}
...
...
blockscad/msg/js/de.js
View file @
0f669a58
This diff is collapsed.
Click to expand it.
blockscad/storage.js
View file @
0f669a58
...
...
@@ -16,7 +16,7 @@ Blockly.Xml = Blockly.Xml || {};
* @private
*/
BlocklyStorage
.
backupBlocks_
=
function
()
{
console
.
log
(
"
in backupBlocks
"
);
//
console.log("in backupBlocks");
if
(
'
localStorage
'
in
window
)
{
// clear out old stuff from localStorage
localStorage
.
clear
();
...
...
@@ -71,7 +71,7 @@ BlocklyStorage.backupOnUnload = function() {
BlocklyStorage
.
restoreBlocks
=
function
()
{
var
url
=
window
.
location
.
href
.
split
(
'
#
'
)[
0
];
url
=
url
.
split
(
'
?lang
'
)[
0
];
console
.
log
(
"
url for restoring blocks is:
"
,
url
);
//
console.log("url for restoring blocks is:",url);
var
url2
=
url
+
"
proj_name
"
;
var
url3
=
url
+
"
current_project
"
;
var
url4
=
url
+
"
current_project_key
"
;
...
...
blockscad/viewer.js
View file @
0f669a58
...
...
@@ -1406,7 +1406,7 @@ Blockscad.Processor.prototype = {
}[
format
];
},
generateAndS
av
eRenderedFile
:
function
()
{
generateAndS
va
eRenderedFile
:
function
()
{
var
blob
=
this
.
currentObjectToBlob
();
var
ext
=
this
.
selectedFormatInfo
().
extension
;
...
...
imgs/de/torus.svg
View file @
0f669a58
...
...
@@ -9,9 +9,9 @@
xmlns=
"http://www.w3.org/2000/svg"
xmlns:sodipodi=
"http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape=
"http://www.inkscape.org/namespaces/inkscape"
width=
"1
73.3354
6mm"
height=
"74.
702179
mm"
viewBox=
"0 0 6
14.18078 264.69276
"
width=
"1
82.9238
6mm"
height=
"74.
427254
mm"
viewBox=
"0 0 6
48.15541 263.71862
"
id=
"svg4208"
version=
"1.1"
inkscape:version=
"0.91 r13725"
...
...
@@ -27,7 +27,7 @@
inkscape:pageshadow=
"2"
inkscape:zoom=
"0.71402898"
inkscape:cx=
"489.58952"
inkscape:cy=
"-2.4141
017
"
inkscape:cy=
"-2.4141
171
"
inkscape:document-units=
"px"
inkscape:current-layer=
"layer1"
showgrid=
"false"
...
...
@@ -35,8 +35,8 @@
inkscape:snap-global=
"false"
inkscape:object-nodes=
"true"
inkscape:snap-smooth-nodes=
"true"
inkscape:window-width=
"1
858
"
inkscape:window-height=
"
1178
"
inkscape:window-width=
"1
304
"
inkscape:window-height=
"
746
"
inkscape:window-x=
"54"
inkscape:window-y=
"-8"
inkscape:window-maximized=
"1"
...
...
@@ -52,7 +52,7 @@
<dc:format>
image/svg+xml
</dc:format>
<dc:type
rdf:resource=
"http://purl.org/dc/dcmitype/StillImage"
/>
<dc:title
/
>
<dc:title
></dc:title
>
</cc:Work>
</rdf:RDF>
</metadata>
...
...
@@ -60,7 +60,7 @@
inkscape:label=
"Layer 1"
inkscape:groupmode=
"layer"
id=
"layer1"
transform=
"translate(-116.87792,-29
4.77042
)"
>
transform=
"translate(-116.87792,-29
5.74454
)"
>
<path
style=
"opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d=
"m 329.38909,434.73022 30.72177,0"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment