Merge pull request #24 from alexcloutier/fix/2612
It is now possible to see the version on the general page of the preferences windowpull/32/head
commit
7b0ffacff0
|
@ -1,6 +1,7 @@
|
|||
config.make
|
||||
tags
|
||||
*/obj/
|
||||
*._*
|
||||
*/*/obj/
|
||||
*/*/*/obj/
|
||||
*/*/*.SOGo/
|
||||
|
|
|
@ -204,6 +204,7 @@
|
|||
"Mail" = "Mail";
|
||||
"Last" = "Last used";
|
||||
"Default module :" = "Default module:";
|
||||
"SOGo version:" = "SOGo version:";
|
||||
|
||||
"Language :" = "Language:";
|
||||
"choose" = "Choose ...";
|
||||
|
|
|
@ -204,6 +204,7 @@
|
|||
"Mail" = "Courrier";
|
||||
"Last" = "Dernier utilisé";
|
||||
"Default module :" = "Module par défaut :";
|
||||
"SOGo version:" = "SOGo version:";
|
||||
|
||||
"Language :" = "Langue :";
|
||||
"choose" = "Choisir ...";
|
||||
|
|
|
@ -46,6 +46,7 @@
|
|||
#import <SOGo/SOGoSystemDefaults.h>
|
||||
#import <SOGo/SOGoUserFolder.h>
|
||||
#import <SOGo/WOResourceManager+SOGo.h>
|
||||
#import <SOGo/SOGoBuild.h>
|
||||
#import <Mailer/SOGoMailAccount.h>
|
||||
#import <Mailer/SOGoMailAccounts.h>
|
||||
#import <Mailer/SOGoMailLabel.h>
|
||||
|
@ -1137,6 +1138,14 @@ static NSArray *reminderValues = nil;
|
|||
}
|
||||
}
|
||||
|
||||
- (NSString *) sogoVersion
|
||||
{
|
||||
// The variable SOGoVersion comes from the import: SOGo/Build.h
|
||||
NSString *sogoVersion = [NSString stringWithString: SOGoVersion];
|
||||
|
||||
return sogoVersion;
|
||||
}
|
||||
|
||||
- (id <WOActionResults>) defaultAction
|
||||
{
|
||||
id <WOActionResults> results;
|
||||
|
|
|
@ -124,6 +124,8 @@
|
|||
<div class="tabs">
|
||||
<div id="generalView" class="tab">
|
||||
<dl class="dl-horizontal">
|
||||
<dt><var:string label:value="SOGo version:"/></dt>
|
||||
<dd><var:string value="sogoVersion"/></dd>
|
||||
<dt><var:string label:value="Language :"/></dt>
|
||||
<dd><var:popup list="languages" item="item"
|
||||
const:id="language"
|
||||
|
|
Loading…
Reference in New Issue