pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Prepare new target

Browse Source
This commit is contained in:
Alexander Yuzhin
2017-08-03 16:15:05 +03:00
parent 160e2fb038
commit fac052811c
21 changed files with 234 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

162
common/loginpage/deploy/index.onlyru.html Normal file
View File

File diff suppressed because one or more lines are too long

32
macos/ONLYOFFICE.xcodeproj/project.pbxproj
View File

File diff suppressed because one or more lines are too long

5
macos/ONLYOFFICE/Code/Controllers/ASCAboutController.m
View File

@ -62,6 +62,11 @@
NSString * locCopyright = localizedInfoDictionary[@"NSHumanReadableCopyright"];
locProductName = locProductName ? locProductName : infoDictionary[@"CFBundleName"];
#ifdef _PRODUCT_ONLYOFFICE_RU_FREE
locProductName = NSLocalizedString("ONLYOFFICE FREE", nil)
#endif
locCopyright = locCopyright ? locCopyright : infoDictionary[@"NSHumanReadableCopyright"];
// EULA View

30
macos/ONLYOFFICE/Code/Controllers/ASCEventsController.mm
View File

@ -299,21 +299,21 @@ public:
}
}
// // Begin hotfix ODP presentation
//
// NSArray* pptxExtension = [supportFormats filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"SELF['extension'] == %@", @"pptx"]];
// NSArray* odpExtension = [supportFormats filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"SELF['extension'] == %@", @"odp"]];
//
// if ([pptxExtension count] > 0 && [odpExtension count] < 1) {
// NSDictionary * info = [ASCConstants ascFormatsInfo][@(AVS_OFFICESTUDIO_FILE_PRESENTATION_ODP)];
// [supportFormats addObject:@{
// @"type" : @(AVS_OFFICESTUDIO_FILE_PRESENTATION_ODP),
// @"description" : info[@"description"],
// @"extension" : info[@"extension"]
// }];
// }
//
// // End hotfix ODP presentation
// Begin hotfix ODP presentation
NSArray* pptxExtension = [supportFormats filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"SELF['extension'] == %@", @"pptx"]];
NSArray* odpExtension = [supportFormats filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"SELF['extension'] == %@", @"odp"]];
if ([pptxExtension count] > 0 && [odpExtension count] < 1) {
NSDictionary * info = [ASCConstants ascFormatsInfo][@(AVS_OFFICESTUDIO_FILE_PRESENTATION_ODP)];
[supportFormats addObject:@{
@"type" : @(AVS_OFFICESTUDIO_FILE_PRESENTATION_ODP),
@"description" : info[@"description"],
@"extension" : info[@"extension"]
}];
}
// End hotfix ODP presentation
[[NSNotificationCenter defaultCenter] postNotificationName:CEFEventNameSaveLocal
object:nil

6
macos/ONLYOFFICE/Code/Utils/ASCConstants.h
View File

@ -54,7 +54,11 @@ typedef NS_ENUM(int, ASCTabActionType) {
ASCTabActionSaveLocalFile,
};
#ifdef _PRODUCT_ONLYOFFICE_RU
#ifdef _PRODUCT_ONLYOFFICE_RU_FREE
static NSString * kRegHelpUrl = @"http://onlyoffice.ru/help";
static NSString * kHelpUrl = @"http://onlyoffice.ru/help";
#else
#ifdef _PRODUCT_ONLYOFFICE_RU_PRO
static NSString * kRegHelpUrl = @"http://onlyoffice.ru/help";
static NSString * kHelpUrl = @"http://onlyoffice.ru/help";
#else

0
macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/Base.lproj/EULA.html → macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/Base.lproj/EULA.html
View File

5
macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/Base.lproj/InfoPlist.strings Normal file
View File

@ -0,0 +1,5 @@
/* (No Commment) */
"CFBundleName" = "ONLYOFFICE";
/* (No Commment) */
"NSHumanReadableCopyright" = "© АО \"Novyye Kommunikatsionnyye Tekhnologii\" 2017 All rights reserved.";

8
macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/Info.plist → macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/Info.plist
View File

@ -220,11 +220,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>4.1.1</string>
<string>4.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>105</string>
<string>169</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.productivity</string>
<key>LSMinimumSystemVersion</key>
@ -235,13 +235,13 @@
<true/>
</dict>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2017 Ascensio System SIA. All rights reserved.</string>
<string>Copyright © АО Novyye Kommunikatsionnyye Tekhnologii. 2017 All rights reserved.</string>
<key>NSMainStoryboardFile</key>
<string>Main</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>SUFeedURL</key>
<string>http://download.onlyoffice.com/install/desktop/editors/mac/onlyoffice.xml</string>
<string>http://download.onlyoffice.com/install/desktop/editors/mac/onlyoffice-ru-free.xml</string>
<key>SUPublicDSAKeyFile</key>
<string>dsa_pub.pem</string>
<key>SUScheduledCheckInterval</key>

0
macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/de.lproj/EULA.html → macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/de.lproj/EULA.html
View File

5
macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/de.lproj/InfoPlist.strings Normal file
View File

@ -0,0 +1,5 @@
/* (No Commment) */
"CFBundleName" = "ONLYOFFICE";
/* (No Commment) */
"NSHumanReadableCopyright" = "© АО \"Novyye Kommunikatsionnyye Tekhnologii\" 2017 All rights reserved.";

0
macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/es.lproj/EULA.html → macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/es.lproj/EULA.html
View File

5
macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/es.lproj/InfoPlist.strings Normal file
View File

@ -0,0 +1,5 @@
/* (No Commment) */
"CFBundleName" = "ONLYOFFICE";
/* (No Commment) */
"NSHumanReadableCopyright" = "© АО \"Novyye Kommunikatsionnyye Tekhnologii\" 2017 All rights reserved.";

0
macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/fr.lproj/EULA.html → macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/fr.lproj/EULA.html
View File

5
macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/fr.lproj/InfoPlist.strings Normal file
View File

@ -0,0 +1,5 @@
/* (No Commment) */
"CFBundleName" = "ONLYOFFICE";
/* (No Commment) */
"NSHumanReadableCopyright" = "© АО \"Novyye Kommunikatsionnyye Tekhnologii\" 2017 All rights reserved.";

0
macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/ru.lproj/EULA.html → macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/ru.lproj/EULA.html
View File

5
macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/ru.lproj/InfoPlist.strings Normal file
View File

@ -0,0 +1,5 @@
/* (No Commment) */
"CFBundleName" = "ONLYOFFICE";
/* (No Commment) */
"NSHumanReadableCopyright" = "© АО \"Новые Коммуникационные Технологии\" 2017 Все права защищены.";

7
macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/Base.lproj/InfoPlist.strings
View File

@ -1,7 +0,0 @@
/*
InfoPlist.strings
ONLYOFFICE
Created by Alexander Yuzhin on 12/29/15.
Copyright © 2015 Ascensio System SIA. All rights reserved.
*/

7
macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/de.lproj/InfoPlist.strings
View File

@ -1,7 +0,0 @@
/*
InfoPlist.strings
ONLYOFFICE
Created by Alexander Yuzhin on 12/29/15.
Copyright © 2015 Ascensio System SIA. All rights reserved.
*/

7
macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/es.lproj/InfoPlist.strings
View File

@ -1,7 +0,0 @@
/*
InfoPlist.strings
ONLYOFFICE
Created by Alexander Yuzhin on 12/29/15.
Copyright © 2015 Ascensio System SIA. All rights reserved.
*/

7
macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/fr.lproj/InfoPlist.strings
View File

@ -1,7 +0,0 @@
/*
InfoPlist.strings
ONLYOFFICE
Created by Alexander Yuzhin on 12/29/15.
Copyright © 2015 Ascensio System SIA. All rights reserved.
*/

5
macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/ru.lproj/InfoPlist.strings
View File

@ -1,5 +0,0 @@
/* (No Commment) */
"CFBundleName" = "ONLYOFFICE";
/* (No Commment) */
"NSHumanReadableCopyright" = "© ЗАО \"Новые Коммуникационные Технологии\" 2017 Все права защищены.";