Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-15 17:47:09 +00:00
Code Issues Releases Activity

i18n-ize conky.cc

Browse Source
This commit is contained in:
Nikolas Garofil 2010-10-31 20:01:20 +01:00
parent b98ebc90ee
commit b902b70e96
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/conky.cc
View File

@ -80,8 +80,8 @@
#ifdef BUILD_CURL
#include <curl/curl.h>
#endif
#include <libintl.h>
#define _(string) gettext(string)
#define _nop(string) string
/* local headers */
#include "core.h"
@ -303,7 +303,7 @@ static void print_version(void)
exit(EXIT_SUCCESS);
}
static const char *suffixes[] = { "B", "KiB", "MiB", "GiB", "TiB", "PiB", "" };
static const char *suffixes[] = { _nop("B"), _nop("KiB"), _nop("MiB"), _nop("GiB"), _nop("TiB"), _nop("PiB"), "" };
#ifdef BUILD_X11
@ -631,7 +631,7 @@ void human_readable(long long num, char *buf, int size)
}
if (llabs(num) < 1000LL) {
spaced_print(buf, size, format, width, 0, (float)num, *suffix);
spaced_print(buf, size, format, width, 0, (float)num, _(*suffix));
return;
}
@ -666,7 +666,7 @@ void human_readable(long long num, char *buf, int size)
if (fnum < 9.995)
precision = 2; /* print 0-9 with two decimal places */
spaced_print(buf, size, format, width, precision, fnum, *suffix);
spaced_print(buf, size, format, width, precision, fnum, _(*suffix));
}
/* global object list root element */
@ -1593,28 +1593,28 @@ int draw_each_line_inner(char *s, int special_index, int last_special_applied)
if (seconds != 0) {
timeunits = seconds / 86400; seconds %= 86400;
if (timeunits <= 0 ||
asprintf(&tmp_day_str, "%dd", timeunits) == -1) {
asprintf(&tmp_day_str, _("%dd"), timeunits) == -1) {
tmp_day_str = strdup("");
}
timeunits = seconds / 3600; seconds %= 3600;
if (timeunits <= 0 ||
asprintf(&tmp_hour_str, "%dh", timeunits) == -1) {
asprintf(&tmp_hour_str, _("%dh"), timeunits) == -1) {
tmp_hour_str = strdup("");
}
timeunits = seconds / 60; seconds %= 60;
if (timeunits <= 0 ||
asprintf(&tmp_min_str, "%dm", timeunits) == -1) {
asprintf(&tmp_min_str, _("%dm"), timeunits) == -1) {
tmp_min_str = strdup("");
}
if (seconds <= 0 ||
asprintf(&tmp_sec_str, "%ds", seconds) == -1) {
asprintf(&tmp_sec_str, _("%ds"), seconds) == -1) {
tmp_sec_str = strdup("");
}
if (asprintf(&tmp_str, "%s%s%s%s", tmp_day_str, tmp_hour_str, tmp_min_str, tmp_sec_str) == -1)
tmp_str = strdup("");
free(tmp_day_str); free(tmp_hour_str); free(tmp_min_str); free(tmp_sec_str);
} else {
tmp_str = strdup("Range not possible"); // should never happen, but better safe then sorry
tmp_str = strdup(_("Range not possible")); // should never happen, but better safe then sorry
}
cur_x += (w / 2) - (font_ascent() * (strlen(tmp_str) / 2));
cur_y += font_h / 2;
@ -2107,7 +2107,7 @@ static void main_loop(void)
if (changed && window.type == TYPE_PANEL) {
int sidenum = -1;
fprintf(stderr, PACKAGE_NAME": defining struts\n");
fprintf(stderr, _(PACKAGE_NAME": defining struts\n"));
fflush(stderr);
switch (text_alignment) {

9
src/logging.h
View File

@ -30,14 +30,15 @@
#ifndef _LOGGING_H
#define _LOGGING_H
#include <libintl.h>
#include "mail.h"
void clean_up(void *memtofree1, void* memtofree2);
void clean_up_without_threads(void *memtofree1, void* memtofree2);
#define NORM_ERR(...) { \
#define NORM_ERR(format, args...) { \
fprintf(stderr, PACKAGE_NAME": "); \
fprintf(stderr, __VA_ARGS__); \
fprintf(stderr, gettext(format), ##args); \
fprintf(stderr, "\n"); \
}
@ -50,10 +51,10 @@ void clean_up_without_threads(void *memtofree1, void* memtofree2);
/* debugging output */
extern int global_debug_level;
#define __DBGP(level, ...) \
#define __DBGP(level, format, args...) \
if (global_debug_level > level) { \
fprintf(stderr, "DEBUG(%d) [" __FILE__ ":%d]: ", level, __LINE__); \
fprintf(stderr, __VA_ARGS__); \
fprintf(stderr, gettext(format), ##args); \
fprintf(stderr, "\n"); \
}
#define DBGP(...) __DBGP(0, __VA_ARGS__)