Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-21 18:50:49 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-21 23:30:08 +0300
commit380ce86a7f0a9f70f9b152541c53e74c52863ef5 (patch)
tree68d075c8e184186e56a32e9dd839cd7cbed1b673 /source/blender/blentranslation
parentc5862e0a06b75767fd863673c54aab54f27d1872 (diff)
Cleanup: comments (long lines) in avi, blf & blt
Diffstat (limited to 'source/blender/blentranslation')
-rw-r--r--source/blender/blentranslation/BLT_lang.h4
-rw-r--r--source/blender/blentranslation/BLT_translation.h11
-rw-r--r--source/blender/blentranslation/intern/blt_lang.c12
-rw-r--r--source/blender/blentranslation/intern/blt_translation.c4
-rw-r--r--source/blender/blentranslation/msgfmt/msgfmt.c9
5 files changed, 24 insertions, 16 deletions
diff --git a/source/blender/blentranslation/BLT_lang.h b/source/blender/blentranslation/BLT_lang.h
index 544f2701258..6ce9a0ba71c 100644
--- a/source/blender/blentranslation/BLT_lang.h
+++ b/source/blender/blentranslation/BLT_lang.h
@@ -42,8 +42,8 @@ void BLT_lang_set(const char *);
/* Get the current locale ([partial] ISO code, e.g. es_ES). */
const char *BLT_lang_get(void);
-/* Get locale's elements (if relevant pointer is not NULL and element actually exists, e.g. if there is no variant,
- * *variant and *language_variant will always be NULL).
+/* Get locale's elements (if relevant pointer is not NULL and element actually exists, e.g.
+ * if there is no variant, *variant and *language_variant will always be NULL).
* Non-null elements are always MEM_mallocN'ed, it's the caller's responsibility to free them.
* NOTE: Always available, even in non-WITH_INTERNATIONAL builds.
*/
diff --git a/source/blender/blentranslation/BLT_translation.h b/source/blender/blentranslation/BLT_translation.h
index 5fdae83951c..c3667c364bc 100644
--- a/source/blender/blentranslation/BLT_translation.h
+++ b/source/blender/blentranslation/BLT_translation.h
@@ -86,11 +86,11 @@ bool BLT_lang_is_ime_supported(void);
/* Default, void context.
* WARNING! The "" context is not the same as no (NULL) context at mo/boost::locale level!
- * NOTE: We translate BLT_I18NCONTEXT_DEFAULT as BLT_I18NCONTEXT_DEFAULT_BPY in Python, as we can't use "natural"
- * None value in rna string properties... :/
+ * NOTE: We translate BLT_I18NCONTEXT_DEFAULT as BLT_I18NCONTEXT_DEFAULT_BPY in Python,
+ * as we can't use "natural" None value in rna string properties... :/
* The void string "" is also interpreted as BLT_I18NCONTEXT_DEFAULT.
- * For perf reason, we only use the first char to detect this context, so other contexts should never start
- * with the same char!
+ * For perf reason, we only use the first char to detect this context,
+ * so other contexts should never start with the same char!
*/
#define BLT_I18NCONTEXT_DEFAULT NULL
#define BLT_I18NCONTEXT_DEFAULT_BPYRNA "*"
@@ -102,7 +102,8 @@ bool BLT_lang_is_ime_supported(void);
* easy to get collisions with other areas...). */
#define BLT_I18NCONTEXT_UI_EVENTS "UI_Events_KeyMaps"
-/* Mark the msgid applies to several elements (needed in some cases, as english adjectives have no plural mark :( ). */
+/* Mark the msgid applies to several elements
+ * (needed in some cases, as english adjectives have no plural mark :( ). */
#define BLT_I18NCONTEXT_PLURAL "Plural"
/* ID-types contexts. */
diff --git a/source/blender/blentranslation/intern/blt_lang.c b/source/blender/blentranslation/intern/blt_lang.c
index e8955235198..52d15a29fc2 100644
--- a/source/blender/blentranslation/intern/blt_lang.c
+++ b/source/blender/blentranslation/intern/blt_lang.c
@@ -118,7 +118,8 @@ static void fill_locales(void)
/* And now, build locales and locale_menu! */
locales_menu = MEM_callocN(num_locales_menu * sizeof(EnumPropertyItem), __func__);
line = lines;
- /* Do not allocate locales with zero-sized mem, as LOCALE macro uses NULL locales as invalid marker! */
+ /* Do not allocate locales with zero-sized mem,
+ * as LOCALE macro uses NULL locales as invalid marker! */
if (num_locales > 0) {
locales = MEM_callocN(num_locales * sizeof(char *), __func__);
while (line) {
@@ -155,7 +156,8 @@ static void fill_locales(void)
/* The DEFAULT/Automatic item... */
if (BLI_strnlen(loc, 2)) {
locales[id] = "";
- /* Keep this tip in sync with the one in rna_userdef (rna_enum_language_default_items). */
+ /* Keep this tip in sync with the one in rna_userdef
+ * (rna_enum_language_default_items). */
locales_menu[idx].description = BLI_strdup(
"Automatically choose system's defined language "
"if available, or fall-back to English");
@@ -307,10 +309,12 @@ const char *BLT_lang_get(void)
#undef LOCALE
#undef ULANGUAGE
-/* Get locale's elements (if relevant pointer is not NULL and element actually exists, e.g. if there is no variant,
+/* Get locale's elements (if relevant pointer is not NULL and element actually exists, e.g.
+ * if there is no variant,
* *variant and *language_variant will always be NULL).
* Non-null elements are always MEM_mallocN'ed, it's the caller's responsibility to free them.
- * NOTE: Keep that one always available, you never know, may become useful even in no-WITH_INTERNATIONAL context...
+ * NOTE: Keep that one always available, you never know,
+ * may become useful even in no-WITH_INTERNATIONAL context...
*/
void BLT_lang_locale_explode(const char *locale,
char **language,
diff --git a/source/blender/blentranslation/intern/blt_translation.c b/source/blender/blentranslation/intern/blt_translation.c
index a4bac6bc01f..64e14522aca 100644
--- a/source/blender/blentranslation/intern/blt_translation.c
+++ b/source/blender/blentranslation/intern/blt_translation.c
@@ -61,8 +61,8 @@ const char *BLT_pgettext(const char *msgctxt, const char *msgid)
msgctxt = BLT_I18NCONTEXT_DEFAULT;
}
ret = bl_locale_pgettext(msgctxt, msgid);
- /* We assume if the returned string is the same (memory level) as the msgid, no translation was found,
- * and we can try py scripts' ones!
+ /* We assume if the returned string is the same (memory level) as the msgid,
+ * no translation was found, and we can try py scripts' ones!
*/
# ifdef WITH_PYTHON
if (ret == msgid) {
diff --git a/source/blender/blentranslation/msgfmt/msgfmt.c b/source/blender/blentranslation/msgfmt/msgfmt.c
index 6beaef74a9f..4ab0bd29a5f 100644
--- a/source/blender/blentranslation/msgfmt/msgfmt.c
+++ b/source/blender/blentranslation/msgfmt/msgfmt.c
@@ -24,8 +24,10 @@
*
* Generate binary message catalog from textual translation description.
*
- * This program converts a textual Uniforum-style message catalog (.po file) into a binary GNU catalog (.mo file).
- * This is essentially the same function as the GNU msgfmt program, however, it is a simpler implementation.
+ * This program converts a textual Uniforum-style message catalog (.po file)
+ * into a binary GNU catalog (.mo file).
+ * This is essentially the same function as the GNU msgfmt program,
+ * however, it is a simpler implementation.
*
* Usage: msgfmt input.po output.po
*/
@@ -206,7 +208,8 @@ static char *generate(GHash *messages, size_t *r_output_size)
tot_vals_len += off->val_len + 1;
}
- /* The header is 7 32-bit unsigned integers. then comes the keys index table, then the values index table. */
+ /* The header is 7 32-bit unsigned integers.
+ * Then comes the keys index table, then the values index table. */
const uint32_t idx_keystart = 7 * 4;
const uint32_t idx_valstart = idx_keystart + 8 * num_keys;
/* We don't use hash tables, so the keys start right after the index tables. */