Skip to content
Snippets Groups Projects
Commit 490e86fa authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

Add/use new text.dat string: Never

datestr() will return this string when passed a time_t value of 0.
parent bb850104
No related branches found
No related tags found
No related merge requests found
......@@ -1109,3 +1109,4 @@
"paging node %u for private chat" 922 NodeActivityPagingNode
"retrieving file from device #%d" 923 NodeActivityRetrievingFile
"performing custom activity" 924 NodeActivityCustom
"never" 925 Never
\ No newline at end of file
......@@ -152,12 +152,12 @@ char* unixtodstr(scfg_t* cfg, time32_t t, char *str)
}
/****************************************************************************/
/* Return 8-char numeric or verbal date */
/* Return 8-char numeric or verbal date or "never" when passed 0 */
/****************************************************************************/
char* datestr(scfg_t* cfg, time_t t, char* str)
{
if(t == 0)
return "--------";
return cfg->text == NULL ? "--------" : cfg->text[Never];
if(!cfg->sys_date_verbal)
return unixtodstr(cfg, (time32_t)t, str);
return verbal_datestr(cfg, t, str);
......
......@@ -941,6 +941,7 @@ enum text {
,NodeActivityPagingNode
,NodeActivityRetrievingFile
,NodeActivityCustom
,Never
,TOTAL_TEXT
};
......
......@@ -516,24 +516,23 @@ const char * const text_defaults[TOTAL_TEXT]={
"\x20\x01\x68\x25\x73\x0d\x0a\x01\x6e\x01\x67\x59\x6f\x75\x20\x77\x65\x72\x65\x20\x61\x77\x61\x72\x64\x65\x64\x20\x01\x68\x25\x73"
"\x01\x6e\x01\x67\x20\x63\x72\x65\x64\x69\x74\x73\x2e\x0d\x0a" // 312 DownloadUserMsg
,"\x70\x61\x72\x74\x69\x61\x6c\x6c\x79\x20" // 313 Partially
,"\x01\x6c\x01\x6e\x01\x67\x4c\x69\x62\x72\x61\x72\x79\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x28\x25\x75\x29\x20"
"\x25\x73" // 314 FiLib
,"\x0d\x0a\x01\x6e\x01\x67\x44\x69\x72\x65\x63\x74\x6f\x72\x79\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x28\x25\x75\x29\x20"
"\x25\x73" // 315 FiDir
,"\x0d\x0a\x01\x6e\x01\x67\x46\x69\x6c\x65\x6e\x61\x6d\x65\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 316 FiFilename
,"\x0d\x0a\x01\x6e\x01\x67\x46\x69\x6c\x65\x20\x73\x69\x7a\x65\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73\x20\x28\x25"
"\x73\x29\x20\x62\x79\x74\x65\x73" // 317 FiFileSize
,"\x0d\x0a\x01\x6e\x01\x67\x43\x72\x65\x64\x69\x74\x20\x76\x61\x6c\x75\x65\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 318 FiCredits
,"\x0d\x0a\x01\x6e\x01\x67\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 319 FiDescription
,"\x0d\x0a\x01\x6e\x01\x67\x55\x70\x6c\x6f\x61\x64\x65\x64\x20\x62\x79\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 320 FiUploadedBy
,"\x0d\x0a\x01\x6e\x01\x67\x46\x69\x6c\x65\x20\x64\x61\x74\x65\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 321 FiFileDate
,"\x0d\x0a\x01\x6e\x01\x67\x55\x70\x6c\x6f\x61\x64\x65\x64\x20\x6f\x6e\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 322 FiDateUled
,"\x0d\x0a\x01\x6e\x01\x67\x4c\x61\x73\x74\x20\x64\x6f\x77\x6e\x6c\x6f\x61\x64\x65\x64\x20\x20\x3a\x01\x68\x20\x25\x73" // 323 FiDateDled
,"\x0d\x0a\x01\x6e\x01\x67\x54\x69\x6d\x65\x73\x20\x64\x6f\x77\x6e\x6c\x6f\x61\x64\x65\x64\x20\x3a\x01\x68\x20\x25\x75" // 324 FiTimesDled
,"\x0d\x0a\x01\x6e\x01\x67\x54\x69\x6d\x65\x20\x74\x6f\x20\x64\x6f\x77\x6e\x6c\x6f\x61\x64\x20\x3a\x01\x68\x20\x25\x73" // 325 FiTransferTime
,"\x0d\x0a\x01\x6e\x01\x67\x54\x61\x67\x73\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 326 FiTags
,"\x0d\x0a\x01\x6e\x01\x67\x55\x70\x6c\x6f\x61\x64\x65\x64\x20\x74\x6f\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 327 FiUploadedTo
,"\x0d\x0a\x01\x6e\x01\x67\x46\x69\x6c\x65\x20\x25\x2d\x36\x2e\x36\x73\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 328 FiChecksum
,"\x01\x6c\x01\x6e\x01\x67\x4c\x69\x62\x72\x61\x72\x79\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x28\x25\x75\x29\x20\x25\x73" // 314 FiLib
,"\x0d\x0a\x01\x6e\x01\x67\x44\x69\x72\x65\x63\x74\x6f\x72\x79\x20\x20\x20\x3a\x01\x68\x20\x28\x25\x75\x29\x20\x25\x73" // 315 FiDir
,"\x0d\x0a\x01\x6e\x01\x67\x46\x69\x6c\x65\x6e\x61\x6d\x65\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 316 FiFilename
,"\x0d\x0a\x01\x6e\x01\x67\x53\x69\x7a\x65\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73\x20\x28\x25\x73\x29\x20\x62\x79"
"\x74\x65\x73" // 317 FiFileSize
,"\x0d\x0a\x01\x6e\x01\x67\x43\x72\x65\x64\x69\x74\x20\x63\x6f\x73\x74\x20\x3a\x01\x68\x20\x25\x73" // 318 FiCredits
,"\x0d\x0a\x01\x6e\x01\x67\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x3a\x01\x68\x20\x25\x73" // 319 FiDescription
,"\x0d\x0a\x01\x6e\x01\x67\x55\x70\x6c\x6f\x61\x64\x65\x64\x20\x62\x79\x20\x3a\x01\x68\x20\x25\x73" // 320 FiUploadedBy
,"\x0d\x0a\x01\x6e\x01\x67\x46\x69\x6c\x65\x20\x64\x61\x74\x65\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 321 FiFileDate
,"\x0d\x0a\x01\x6e\x01\x67\x55\x70\x6c\x6f\x61\x64\x65\x64\x20\x6f\x6e\x20\x3a\x01\x68\x20\x25\x73" // 322 FiDateUled
,"\x0d\x0a\x01\x6e\x01\x67\x4c\x61\x73\x74\x20\x44\x2f\x4c\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 323 FiDateDled
,"\x0d\x0a\x01\x6e\x01\x67\x54\x69\x6d\x65\x73\x20\x44\x2f\x4c\x65\x64\x20\x3a\x01\x68\x20\x25\x75" // 324 FiTimesDled
,"\x0d\x0a\x01\x6e\x01\x67\x54\x69\x6d\x65\x20\x74\x6f\x20\x44\x2f\x4c\x20\x3a\x01\x68\x20\x25\x73\x20\x61\x74\x20\x25\x75\x20\x63"
"\x70\x73" // 325 FiTransferTime
,"\x0d\x0a\x01\x6e\x01\x67\x54\x61\x67\x73\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 326 FiTags
,"\x0d\x0a\x01\x6e\x01\x67\x55\x70\x6c\x6f\x61\x64\x65\x64\x20\x74\x6f\x20\x3a\x01\x68\x20\x25\x73" // 327 FiUploadedTo
,"\x0d\x0a\x01\x6e\x01\x67\x25\x2d\x36\x2e\x36\x73\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 328 FiChecksum
,"\x07\x07\x0d\x0a\x01\x68\x01\x72\x48\x01\x62\x61\x01\x67\x70\x01\x79\x70\x01\x63\x79\x20\x01\x6d\x42\x01\x77\x69\x01\x72\x72\x01"
"\x67\x74\x01\x62\x68\x01\x63\x64\x01\x6d\x61\x01\x79\x79\x20\x01\x77\x74\x01\x72\x6f\x20\x01\x67\x79\x01\x62\x6f\x01\x63\x75\x0d"
"\x0a\x07\x07\x01\x6d\x48\x01\x79\x61\x01\x77\x70\x01\x72\x70\x01\x67\x79\x20\x01\x62\x42\x01\x63\x69\x01\x6d\x72\x01\x79\x74\x01"
......@@ -1488,4 +1487,5 @@ const char * const text_defaults[TOTAL_TEXT]={
,"\x70\x61\x67\x69\x6e\x67\x20\x6e\x6f\x64\x65\x20\x25\x75\x20\x66\x6f\x72\x20\x70\x72\x69\x76\x61\x74\x65\x20\x63\x68\x61\x74" // 922 NodeActivityPagingNode
,"\x72\x65\x74\x72\x69\x65\x76\x69\x6e\x67\x20\x66\x69\x6c\x65\x20\x66\x72\x6f\x6d\x20\x64\x65\x76\x69\x63\x65\x20\x23\x25\x64" // 923 NodeActivityRetrievingFile
,"\x70\x65\x72\x66\x6f\x72\x6d\x69\x6e\x67\x20\x63\x75\x73\x74\x6f\x6d\x20\x61\x63\x74\x69\x76\x69\x74\x79" // 924 NodeActivityCustom
,"\x6e\x65\x76\x65\x72" // 925 Never
};
......@@ -925,4 +925,5 @@ const char* const text_id[]={
,"NodeActivityPagingNode"
,"NodeActivityRetrievingFile"
,"NodeActivityCustom"
,"Never"
};
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment