Skip to content

Commit 041d94e

Browse files
committed
Remove hardcoded _ts.h file from makefile, fix link in docs
1 parent 1be630e commit 041d94e

3 files changed

Lines changed: 10 additions & 19 deletions

File tree

addon/doxywizard/CMakeLists.txt

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -166,16 +166,7 @@ qt_add_resources(doxywizard_CONFIG_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/config.
166166

167167
set(TRANSLATIONS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/translations)
168168

169-
set(DOXYWIZARD_TRANSLATION_FILES
170-
${TRANSLATIONS_DIR}/doxywizard_zh_CN.ts
171-
${TRANSLATIONS_DIR}/doxywizard_zh_TW.ts
172-
${TRANSLATIONS_DIR}/doxywizard_de.ts
173-
${TRANSLATIONS_DIR}/doxywizard_fr.ts
174-
${TRANSLATIONS_DIR}/doxywizard_ja.ts
175-
${TRANSLATIONS_DIR}/doxywizard_ko.ts
176-
${TRANSLATIONS_DIR}/doxywizard_es.ts
177-
${TRANSLATIONS_DIR}/doxywizard_ru.ts
178-
)
169+
file(GLOB DOXYWIZARD_TRANSLATION_FILES CONFIGURE_DEPENDS "${TRANSLATIONS_DIR}/doxywizard_*.ts")
179170

180171
set(ALL_TRANSLATION_FILES
181172
${DOXYWIZARD_TRANSLATION_FILES}

addon/doxywizard/expert.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,6 @@ QString convertDoxyCmdToHtml(const QString &s)
140140
result.replace(SA("\\#undef"),SA("#undef"));
141141
result.replace(SA("\\# "),SA("# "));
142142

143-
// -# -> <br>-
144-
result.replace(SA("-#"),SA("<br>-"));
145-
result.replace(SA(" - "),SA("<br>-"));
146-
147-
// \sa -> <br>See also:
148-
result.replace(SA("\\sa "),SA("<br>See also: "));
149-
150143
// \par -> <br>
151144
result.replace(SA("\\par "),SA("<br>"));
152145

@@ -180,7 +173,7 @@ QString convertDoxyCmdToHtml(const QString &s)
180173

181174
// http/https URLs -> links
182175
// Only match URL-safe characters, exclude trailing punctuation
183-
regexp.setPattern(SA(" (https?://[a-zA-Z0-9_\\-./~%#+?=&]*[a-zA-Z0-9_\\-/~%#+?=&])"));
176+
regexp.setPattern(SA(" (https?://[a-zA-Z0-9_\\-./~%#+?=&@]*[a-zA-Z0-9_\\-/~%#+?=&])"));
184177
QRegularExpressionMatchIterator urlIt = regexp.globalMatch(result);
185178
QStringList urlReplacements;
186179
while (urlIt.hasNext())
@@ -207,6 +200,13 @@ QString convertDoxyCmdToHtml(const QString &s)
207200
result.replace(SA("&lt;br&gt;"), SA("<br/>"));
208201
result.replace(SA("&lt;br/&gt;"), SA("<br/>"));
209202

203+
// -# -> <br>-
204+
result.replace(SA("-#"),SA("<br>-"));
205+
result.replace(SA(" - "),SA("<br>-"));
206+
207+
// \sa -> <br>See also:
208+
result.replace(SA("\\sa "),SA("<br>See also: "));
209+
210210
return result;
211211
}
212212

doc/language.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ really obsolete translators brings too much maintenance and
341341
run-time overhead.
342342

343343
\htmlonly
344-
Go to the <a href="md_i18n__guide.html">next</a> section or return to the
344+
Go to the <a href="i18n_guide.html">next</a> section or return to the
345345
<a href="index.html">index</a>.
346346
\endhtmlonly
347347

0 commit comments

Comments
 (0)