summaryrefslogtreecommitdiffstats
path: root/Plugins/JsonExport
diff options
context:
space:
mode:
Diffstat (limited to 'Plugins/JsonExport')
-rw-r--r--Plugins/JsonExport/JsonExport.pro4
-rw-r--r--Plugins/JsonExport/JsonExport_ro_RO.qmbin0 -> 30 bytes
-rw-r--r--Plugins/JsonExport/JsonExport_ro_RO.ts22
-rw-r--r--Plugins/JsonExport/jsonexport.cpp4
-rw-r--r--Plugins/JsonExport/jsonexport.h2
-rw-r--r--Plugins/JsonExport/jsonexport.json2
-rw-r--r--Plugins/JsonExport/jsonexport.qrc2
-rw-r--r--Plugins/JsonExport/package.xml10
8 files changed, 41 insertions, 5 deletions
diff --git a/Plugins/JsonExport/JsonExport.pro b/Plugins/JsonExport/JsonExport.pro
index 8be51fa..9ecf077 100644
--- a/Plugins/JsonExport/JsonExport.pro
+++ b/Plugins/JsonExport/JsonExport.pro
@@ -28,7 +28,8 @@ RESOURCES += \
jsonexport.qrc
-TRANSLATIONS += JsonExport_de.ts \
+TRANSLATIONS += JsonExport_ro_RO.ts \
+ JsonExport_de.ts \
JsonExport_it.ts \
JsonExport_zh_CN.ts \
JsonExport_sk.ts \
@@ -52,3 +53,4 @@ TRANSLATIONS += JsonExport_de.ts \
+
diff --git a/Plugins/JsonExport/JsonExport_ro_RO.qm b/Plugins/JsonExport/JsonExport_ro_RO.qm
new file mode 100644
index 0000000..2856eb9
--- /dev/null
+++ b/Plugins/JsonExport/JsonExport_ro_RO.qm
Binary files differ
diff --git a/Plugins/JsonExport/JsonExport_ro_RO.ts b/Plugins/JsonExport/JsonExport_ro_RO.ts
new file mode 100644
index 0000000..1264580
--- /dev/null
+++ b/Plugins/JsonExport/JsonExport_ro_RO.ts
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="ro_RO">
+<context>
+ <name>JsonExportConfig</name>
+ <message>
+ <location filename="jsonexport.ui" line="20"/>
+ <source>Output format</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="jsonexport.ui" line="26"/>
+ <source>Format document (new lines, indentation)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="jsonexport.ui" line="42"/>
+ <source>Compress (everything in one line)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+</TS>
diff --git a/Plugins/JsonExport/jsonexport.cpp b/Plugins/JsonExport/jsonexport.cpp
index 51fd60a..961169e 100644
--- a/Plugins/JsonExport/jsonexport.cpp
+++ b/Plugins/JsonExport/jsonexport.cpp
@@ -324,8 +324,8 @@ QString JsonExport::escapeString(const QString& str)
{
QString copy = str;
return "\"" +
- copy.replace("\"", "\\\"")
- .replace("\\", "\\\\")
+ copy.replace("\\", "\\\\")
+ .replace("\"", "\\\"")
.replace("/", "\\/")
.replace("\b", "\\b")
.replace("\f", "\\f")
diff --git a/Plugins/JsonExport/jsonexport.h b/Plugins/JsonExport/jsonexport.h
index 150592d..c9706e0 100644
--- a/Plugins/JsonExport/jsonexport.h
+++ b/Plugins/JsonExport/jsonexport.h
@@ -66,7 +66,7 @@ class JSONEXPORTSHARED_EXPORT JsonExport : public GenericExportPlugin
void writePrefixBeforeEnd();
void writePrefixBeforeNextElement();
- CFG_LOCAL(JsonExportConfig, cfg)
+ CFG_LOCAL_PERSISTABLE(JsonExportConfig, cfg)
QStack<int> elementCounter;
bool indent = false;
int indentDepth = 0;
diff --git a/Plugins/JsonExport/jsonexport.json b/Plugins/JsonExport/jsonexport.json
index bdc6396..54a502e 100644
--- a/Plugins/JsonExport/jsonexport.json
+++ b/Plugins/JsonExport/jsonexport.json
@@ -2,6 +2,6 @@
"type": "ExportPlugin",
"title": "JSON export",
"description": "Provides JSON format for exporting.",
- "version": 10001,
+ "version": 10002,
"author": "SalSoft"
}
diff --git a/Plugins/JsonExport/jsonexport.qrc b/Plugins/JsonExport/jsonexport.qrc
index 2b9c8e8..feabbc0 100644
--- a/Plugins/JsonExport/jsonexport.qrc
+++ b/Plugins/JsonExport/jsonexport.qrc
@@ -3,6 +3,7 @@
<file>jsonexport.ui</file>
</qresource>
<qresource prefix="/msg">
+ <file>JsonExport_ro_RO.qm</file>
<file>JsonExport_de.qm</file>
@@ -16,3 +17,4 @@
+
diff --git a/Plugins/JsonExport/package.xml b/Plugins/JsonExport/package.xml
new file mode 100644
index 0000000..15e41ae
--- /dev/null
+++ b/Plugins/JsonExport/package.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<Package>
+ <DisplayName>JSON Export plugin</DisplayName>
+ <Description>Plugin for exporting into JSON format.</Description>
+ <Version>%VERSION%</Version>
+ <ReleaseDate>%DATE%</ReleaseDate>
+ <Name>pl.com.salsoft.sqlitestudio.plugins.jsonexport</Name>
+ <Dependencies>pl.com.salsoft.sqlitestudio.plugins</Dependencies>
+ <Default>true</Default>
+</Package> \ No newline at end of file