Skip to content

Commit 8e49509

Browse files
committed
Allowed relative paths
1 parent 6a99fff commit 8e49509

2 files changed

Lines changed: 18 additions & 1 deletion

File tree

src/com/maxprograms/javapm/CreateXliff.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,18 @@ public static void main(String[] args) {
9090
logger.log(Level.ERROR, Messages.getString("CreateXliff.0"));
9191
return;
9292
}
93+
File src = new File(srcFolder);
94+
if (!src.isAbsolute()) {
95+
srcFolder = src.getAbsoluteFile().getAbsolutePath();
96+
}
9397
if (xliff.isEmpty()) {
9498
logger.log(Level.ERROR, Messages.getString("CreateXliff.1"));
9599
return;
96100
}
101+
File xliffFile = new File(xliff);
102+
if (!xliffFile.isAbsolute()) {
103+
xliff = xliffFile.getAbsoluteFile().getAbsolutePath();
104+
}
97105
if (srcLang.isEmpty()) {
98106
logger.log(Level.ERROR, Messages.getString("CreateXliff.2"));
99107
return;

src/com/maxprograms/javapm/MergeXliff.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,18 @@ public static void main(String[] args) {
6868
logger.log(Level.ERROR, Messages.getString("MergeXliff.0"));
6969
return;
7070
}
71+
File src = new File(srcFolder);
72+
if (!src.isAbsolute()) {
73+
srcFolder = src.getAbsoluteFile().getAbsolutePath();
74+
}
7175
if (xliff.isEmpty()) {
7276
logger.log(Level.ERROR, Messages.getString("MergeXliff.1"));
7377
return;
7478
}
79+
File xliffFile = new File(xliff);
80+
if (!xliffFile.isAbsolute()) {
81+
xliff = xliffFile.getAbsoluteFile().getAbsolutePath();
82+
}
7583
try {
7684
mergeXliff(srcFolder, xliff, unapproved, exportTMX);
7785
} catch (IOException | SAXException | ParserConfigurationException e) {
@@ -134,7 +142,8 @@ private static void mergeXliff(String src, String xliff, boolean unapproved, boo
134142
}
135143
}
136144

137-
private static String getTarget(String src, String xliff) throws SAXException, IOException, ParserConfigurationException {
145+
private static String getTarget(String src, String xliff)
146+
throws SAXException, IOException, ParserConfigurationException {
138147
SAXBuilder builder = new SAXBuilder();
139148
Document doc = builder.build(xliff);
140149
List<Element> files = doc.getRootElement().getChildren("file");

0 commit comments

Comments
 (0)