Updated Formatting to now maintain Xcode formatting#104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
igorkulman merged 14 commits into from
Feb 12, 2023
Merged

Updated Formatting to now maintain Xcode formatting #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
42f15af
Formatting updates to maintain xcode format
Mcrich23 Jan 25, 2023
8ded344
Formatting Bug Fixes
Mcrich23 Jan 25, 2023
53d4d69
Silenced SwiftLint Warnings
Mcrich23 Jan 25, 2023
537bc39
Updated settings and reset bundle id
Mcrich23 Jan 25, 2023
4bf609c
set build number
Mcrich23 Jan 25, 2023
64d524a
Bug Fixes
Mcrich23 Jan 25, 2023
063d02a
Silenced SwiftLint warnings
Mcrich23 Jan 25, 2023
f1aa200
Silenced SwiftLint warnings
Mcrich23 Jan 25, 2023
f95b3d0
Update Info.plist
Mcrich23 Jan 25, 2023
722dc45
removed extra spacing
Mcrich23 Jan 25, 2023
57f67f2
Removed Header from comments in main view
Mcrich23 Jan 25, 2023
fa75259
Update Info.plist
Mcrich23 Jan 25, 2023
07f93b1
Bug Fixes
Mcrich23 Jan 25, 2023
80044eb
Update Info.plist
Mcrich23 Jan 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions sources/LocalizationEditor.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -352,7 +352,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 1010;
LastUpgradeCheck = 1310;
LastUpgradeCheck = 1410;
ORGANIZATIONNAME = "Igor Kulman";
TargetAttributes = {
F3D9C94120BEC7460081830A = {
Expand DownExpand Up@@ -579,6 +579,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
Expand DownExpand Up@@ -640,6 +641,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand DownExpand Up@@ -667,14 +669,17 @@
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 310;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = LocalizationEditor/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
MARKETING_VERSION = 2.9;
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
MARKETING_VERSION = 2.9.1;
PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditor;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand All@@ -689,14 +694,17 @@
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 310;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = LocalizationEditor/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
MARKETING_VERSION = 2.9;
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
MARKETING_VERSION = 2.9.1;
PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditor;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand All@@ -710,13 +718,15 @@
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = S6EJ3ZVM4G;
INFOPLIST_FILE = LocalizationEditorTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditorTests;
Expand All@@ -733,13 +743,15 @@
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = S6EJ3ZVM4G;
INFOPLIST_FILE = LocalizationEditorTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditorTests;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
2 changes: 1 addition & 1 deletion sources/LocalizationEditor.xcodeproj/xcshareddata/xcschemes/LocalizationEditor.xcscheme
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1310"
LastUpgradeVersion = "1410"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
8 changes: 8 additions & 0 deletions sources/LocalizationEditor/Extensions/String+Extensions.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,14 @@
import Foundation

extension String {
func slice(from fromString: String, to toString: String) -> String? {
return (range(of: fromString)?.upperBound).flatMap { substringFrom in
(range(of: toString, range: substringFrom..<endIndex)?.lowerBound).map { substringTo in
String(self[substringFrom..<substringTo])
}
}
}

var normalized: String {
return folding(options: [.diacriticInsensitive, .caseInsensitive], locale: .current)
}
Expand Down
2 changes: 1 addition & 1 deletion sources/LocalizationEditor/Info.plist
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>269</string>
<string>319</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>
Expand Down
12 changes: 9 additions & 3 deletions sources/LocalizationEditor/Models/Localization.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,18 +23,24 @@ final class Localization {
}

func update(key: String, value: String, message: String?) {
if let object = translations.first(where: { string in
string.message != nil && string.message!.contains("\n ")
}), let index = translations.firstIndex(of: object) {
let setObject = LocalizationString(key: object.key, value: object.value, message: "/*[Header]\(object.message!.replacingOccurrences(of: "/*", with: "").replacingOccurrences(of: "*/", with: ""))*/")
translations.insert(setObject, at: 0)
translations.remove(at: index + 1)
}
if let existing = translations.first(where: { $0.key == key }) {
existing.update(newValue: value)
return
}

let newTranslation = LocalizationString(key: key, value: value, message: message)
translations = (translations + [newTranslation]).sorted()
translations.append(newTranslation)
}

func add(key: String, message: String?) -> LocalizationString {
let newTranslation = LocalizationString(key: key, value: "", message: message)
translations = (translations.filter({ $0.key != key }) + [newTranslation]).sorted()
translations.append(newTranslation)
return newTranslation
}

Expand Down
18 changes: 10 additions & 8 deletions sources/LocalizationEditor/Providers/LocalizationProvider.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,19 +49,21 @@ final class LocalizationProvider {
private func writeToFile(localization: Localization) {
let data = localization.translations.map { string -> String in
let stringForMessage: String
if let newMessage = string.message {
stringForMessage = "/* \(newMessage) */"
if let newMessage = string.message, newMessage.replacingOccurrences(of: " ", with: "") != "" {
stringForMessage = "\n/* \(newMessage) */\n"
} else {
stringForMessage = ""
}

return """
\(stringForMessage)
\"\(string.key)\" = \"\(string.value.escaped)\";\n
"""
if let originalMessage = string.message, originalMessage.contains("[Header]") {
let topFormat = originalMessage.replacingOccurrences(of: "[Header]", with: "")
let message = string.value.replacingOccurrences(of: topFormat, with: "")
return "\(topFormat)\n\n\"\(string.key)\" = \"\(message.escaped)\";"
} else {
return "\(stringForMessage)\"\(string.key)\" = \"\(string.value.escaped)\";"
}
}.reduce("") { prev, next in
"\(prev)\n\(next)"
}
}.replacingOccurrences(of: "\n/*", with: "/*")

do {
try data.write(toFile: localization.path, atomically: false, encoding: .utf8)
Expand Down
5 changes: 4 additions & 1 deletion sources/LocalizationEditor/Providers/LocalizationsDataSource.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -184,7 +184,10 @@ final class LocalizationsDataSource: NSObject {
guard let key = getKey(row: row), let part = data[key], let languageKey = mainLocalization?.language else {
return nil
}
return part[languageKey]??.message
guard let message = part[languageKey]??.message, !message.contains("\n ") else {
return nil
}
return message
}

/**
Expand Down
6 changes: 3 additions & 3 deletions sources/LocalizationEditor/UI/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="20037"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
Expand DownExpand Up@@ -529,7 +529,7 @@ Gw
</scene>
</scenes>
<resources>
<image name="NSAddTemplate" width="14" height="13"/>
<image name="NSAddTemplate" width="18" height="17"/>
<image name="NSFolder" width="32" height="32"/>
</resources>
</document>
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Updated Formatting to now maintain Xcode formatting#104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

igorkulman
merged 14 commits into

from

Feb 12, 2023
 Merged


Updated Formatting to now maintain Xcode formatting
#104
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
42f15af

Formatting updates to maintain xcode format


Mcrich23 Jan 25, 2023
8ded344

Formatting Bug Fixes


Mcrich23 Jan 25, 2023
53d4d69

Silenced SwiftLint Warnings


Mcrich23 Jan 25, 2023
537bc39

Updated settings and reset bundle id


Mcrich23 Jan 25, 2023
4bf609c

set build number


Mcrich23 Jan 25, 2023
64d524a

Bug Fixes


Mcrich23 Jan 25, 2023
063d02a

Silenced SwiftLint warnings


Mcrich23 Jan 25, 2023
f1aa200

Silenced SwiftLint warnings


Mcrich23 Jan 25, 2023
f95b3d0

Update Info.plist


Mcrich23 Jan 25, 2023
722dc45

removed extra spacing


Mcrich23 Jan 25, 2023
57f67f2

Removed Header from comments in main view


Mcrich23 Jan 25, 2023
fa75259

Update Info.plist


Mcrich23 Jan 25, 2023
07f93b1

Bug Fixes


Mcrich23 Jan 25, 2023
80044eb

Update Info.plist


Mcrich23 Jan 25, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 15 additions & 3 deletions
sources/LocalizationEditor.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -352,7 +352,7 @@
 isa = PBXProject;
 attributes = {
 LastSwiftUpdateCheck = 1010;
 LastUpgradeCheck = 1310;
 LastUpgradeCheck = 1410;
 ORGANIZATIONNAME = "Igor Kulman";
 TargetAttributes = {
 F3D9C94120BEC7460081830A = {
Expand DownExpand Up@@ -579,6 +579,7 @@
 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 CODE_SIGN_IDENTITY = "-";
 COPY_PHASE_STRIP = NO;
 DEAD_CODE_STRIPPING = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;
 ENABLE_STRICT_OBJC_MSGSEND = YES;
 ENABLE_TESTABILITY = YES;
Expand DownExpand Up@@ -640,6 +641,7 @@
 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 CODE_SIGN_IDENTITY = "-";
 COPY_PHASE_STRIP = NO;
 DEAD_CODE_STRIPPING = YES;
 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 ENABLE_NS_ASSERTIONS = NO;
 ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand DownExpand Up@@ -667,14 +669,17 @@
 CODE_SIGN_IDENTITY = "-";
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 310;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = "";
 FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 INFOPLIST_FILE = LocalizationEditor/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/../Frameworks",
 );
 MARKETING_VERSION = 2.9;
 MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 MARKETING_VERSION = 2.9.1;
 PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditor;
 PRODUCT_NAME = "$(TARGET_NAME)";
 SWIFT_VERSION = 5.0;
Expand All@@ -689,14 +694,17 @@
 CODE_SIGN_IDENTITY = "-";
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 310;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = "";
 FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 INFOPLIST_FILE = LocalizationEditor/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/../Frameworks",
 );
 MARKETING_VERSION = 2.9;
 MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 MARKETING_VERSION = 2.9.1;
 PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditor;
 PRODUCT_NAME = "$(TARGET_NAME)";
 SWIFT_VERSION = 5.0;
Expand All@@ -710,13 +718,15 @@
 CLANG_ENABLE_OBJC_WEAK = YES;
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = S6EJ3ZVM4G;
 INFOPLIST_FILE = LocalizationEditorTests/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/../Frameworks",
 "@loader_path/../Frameworks",
 );
 MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 MTL_FAST_MATH = YES;
 PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditorTests;
Expand All@@ -733,13 +743,15 @@
 CLANG_ENABLE_OBJC_WEAK = YES;
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = S6EJ3ZVM4G;
 INFOPLIST_FILE = LocalizationEditorTests/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/../Frameworks",
 "@loader_path/../Frameworks",
 );
 MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 MTL_FAST_MATH = YES;
 PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditorTests;
 PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down

2 changes: 1 addition & 1 deletion
sources/LocalizationEditor.xcodeproj/xcshareddata/xcschemes/LocalizationEditor.xcscheme

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
 LastUpgradeVersion = "1310"
 LastUpgradeVersion = "1410"
 version = "1.3">
 <BuildAction
 parallelizeBuildables = "YES"
Expand Down

8 changes: 8 additions & 0 deletions
sources/LocalizationEditor/Extensions/String+Extensions.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,14 @@
import Foundation

extension String {
 func slice(from fromString: String, to toString: String) -> String? {
 return (range(of: fromString)?.upperBound).flatMap { substringFrom in
 (range(of: toString, range: substringFrom..<endIndex)?.lowerBound).map { substringTo in
 String(self[substringFrom..<substringTo])
 }
 }
 }

 var normalized: String {
 return folding(options: [.diacriticInsensitive, .caseInsensitive], locale: .current)
 }
Expand Down

2 changes: 1 addition & 1 deletion
sources/LocalizationEditor/Info.plist

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@
	<key>CFBundleShortVersionString</key>
	<string>$(MARKETING_VERSION)</string>
	<key>CFBundleVersion</key>
	<string>269</string>
	<string>319</string>
	<key>LSMinimumSystemVersion</key>
	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
	<key>NSHumanReadableCopyright</key>
Expand Down

12 changes: 9 additions & 3 deletions
sources/LocalizationEditor/Models/Localization.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,18 +23,24 @@ final class Localization {
 }

 func update(key: String, value: String, message: String?) {
 if let object = translations.first(where: { string in
 string.message != nil && string.message!.contains("\n ")
 }), let index = translations.firstIndex(of: object) {
 let setObject = LocalizationString(key: object.key, value: object.value, message: "/*[Header]\(object.message!.replacingOccurrences(of: "/*", with: "").replacingOccurrences(of: "*/", with: ""))*/")
 translations.insert(setObject, at: 0)
 translations.remove(at: index + 1)
 }
 if let existing = translations.first(where: { $0.key == key }) {
 existing.update(newValue: value)
 return
 }

 let newTranslation = LocalizationString(key: key, value: value, message: message)
 translations = (translations + [newTranslation]).sorted()
 translations.append(newTranslation)
 }

 func add(key: String, message: String?) -> LocalizationString {
 let newTranslation = LocalizationString(key: key, value: "", message: message)
 translations = (translations.filter({ $0.key != key }) + [newTranslation]).sorted()
 translations.append(newTranslation)
 return newTranslation
 }

Expand Down

18 changes: 10 additions & 8 deletions
sources/LocalizationEditor/Providers/LocalizationProvider.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,19 +49,21 @@ final class LocalizationProvider {
 private func writeToFile(localization: Localization) {
 let data = localization.translations.map { string -> String in
 let stringForMessage: String
 if let newMessage = string.message {
 stringForMessage = "/* \(newMessage) */"
 if let newMessage = string.message, newMessage.replacingOccurrences(of: " ", with: "") != "" {
 stringForMessage = "\n/* \(newMessage) */\n"
 } else {
 stringForMessage = ""
 }

 return """
 \(stringForMessage)
 \"\(string.key)\" = \"\(string.value.escaped)\";\n
 """
 if let originalMessage = string.message, originalMessage.contains("[Header]") {
 let topFormat = originalMessage.replacingOccurrences(of: "[Header]", with: "")
 let message = string.value.replacingOccurrences(of: topFormat, with: "")
 return "\(topFormat)\n\n\"\(string.key)\" = \"\(message.escaped)\";"
 } else {
 return "\(stringForMessage)\"\(string.key)\" = \"\(string.value.escaped)\";"
 }
 }.reduce("") { prev, next in
 "\(prev)\n\(next)"
 }
 }.replacingOccurrences(of: "\n/*", with: "/*")

 do {
 try data.write(toFile: localization.path, atomically: false, encoding: .utf8)
Expand Down

5 changes: 4 additions & 1 deletion
sources/LocalizationEditor/Providers/LocalizationsDataSource.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,7 +184,10 @@ final class LocalizationsDataSource: NSObject {
 guard let key = getKey(row: row), let part = data[key], let languageKey = mainLocalization?.language else {
 return nil
 }
 return part[languageKey]??.message
 guard let message = part[languageKey]??.message, !message.contains("\n ") else {
 return nil
 }
 return message
 }

 /**
Expand Down

6 changes: 3 additions & 3 deletions
sources/LocalizationEditor/UI/Base.lproj/Main.storyboard

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
 <dependencies>
 <deployment identifier="macosx"/>
 <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="20037"/>
 <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
 </dependencies>
 <scenes>
Expand DownExpand Up@@ -529,7 +529,7 @@ Gw
 </scene>
 </scenes>
 <resources>
 <image name="NSAddTemplate" width="14" height="13"/>
 <image name="NSAddTemplate" width="18" height="17"/>
 <image name="NSFolder" width="32" height="32"/>
 </resources>
</document>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Updated Formatting to now maintain Xcode formatting#104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

igorkulman
merged 14 commits into

from

Feb 12, 2023
 Merged


Updated Formatting to now maintain Xcode formatting
#104
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
42f15af

Formatting updates to maintain xcode format


Mcrich23 Jan 25, 2023
8ded344

Formatting Bug Fixes


Mcrich23 Jan 25, 2023
53d4d69

Silenced SwiftLint Warnings


Mcrich23 Jan 25, 2023
537bc39

Updated settings and reset bundle id


Mcrich23 Jan 25, 2023
4bf609c

set build number


Mcrich23 Jan 25, 2023
64d524a

Bug Fixes


Mcrich23 Jan 25, 2023
063d02a

Silenced SwiftLint warnings


Mcrich23 Jan 25, 2023
f1aa200

Silenced SwiftLint warnings


Mcrich23 Jan 25, 2023
f95b3d0

Update Info.plist


Mcrich23 Jan 25, 2023
722dc45

removed extra spacing


Mcrich23 Jan 25, 2023
57f67f2

Removed Header from comments in main view


Mcrich23 Jan 25, 2023
fa75259

Update Info.plist


Mcrich23 Jan 25, 2023
07f93b1

Bug Fixes


Mcrich23 Jan 25, 2023
80044eb

Update Info.plist


Mcrich23 Jan 25, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 15 additions & 3 deletions
sources/LocalizationEditor.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -352,7 +352,7 @@
 isa = PBXProject;
 attributes = {
 LastSwiftUpdateCheck = 1010;
 LastUpgradeCheck = 1310;
 LastUpgradeCheck = 1410;
 ORGANIZATIONNAME = "Igor Kulman";
 TargetAttributes = {
 F3D9C94120BEC7460081830A = {
Expand DownExpand Up@@ -579,6 +579,7 @@
 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 CODE_SIGN_IDENTITY = "-";
 COPY_PHASE_STRIP = NO;
 DEAD_CODE_STRIPPING = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;
 ENABLE_STRICT_OBJC_MSGSEND = YES;
 ENABLE_TESTABILITY = YES;
Expand DownExpand Up@@ -640,6 +641,7 @@
 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 CODE_SIGN_IDENTITY = "-";
 COPY_PHASE_STRIP = NO;
 DEAD_CODE_STRIPPING = YES;
 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 ENABLE_NS_ASSERTIONS = NO;
 ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand DownExpand Up@@ -667,14 +669,17 @@
 CODE_SIGN_IDENTITY = "-";
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 310;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = "";
 FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 INFOPLIST_FILE = LocalizationEditor/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/../Frameworks",
 );
 MARKETING_VERSION = 2.9;
 MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 MARKETING_VERSION = 2.9.1;
 PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditor;
 PRODUCT_NAME = "$(TARGET_NAME)";
 SWIFT_VERSION = 5.0;
Expand All@@ -689,14 +694,17 @@
 CODE_SIGN_IDENTITY = "-";
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 310;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = "";
 FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 INFOPLIST_FILE = LocalizationEditor/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/../Frameworks",
 );
 MARKETING_VERSION = 2.9;
 MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 MARKETING_VERSION = 2.9.1;
 PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditor;
 PRODUCT_NAME = "$(TARGET_NAME)";
 SWIFT_VERSION = 5.0;
Expand All@@ -710,13 +718,15 @@
 CLANG_ENABLE_OBJC_WEAK = YES;
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = S6EJ3ZVM4G;
 INFOPLIST_FILE = LocalizationEditorTests/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/../Frameworks",
 "@loader_path/../Frameworks",
 );
 MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 MTL_FAST_MATH = YES;
 PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditorTests;
Expand All@@ -733,13 +743,15 @@
 CLANG_ENABLE_OBJC_WEAK = YES;
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = S6EJ3ZVM4G;
 INFOPLIST_FILE = LocalizationEditorTests/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/../Frameworks",
 "@loader_path/../Frameworks",
 );
 MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 MTL_FAST_MATH = YES;
 PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditorTests;
 PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down

2 changes: 1 addition & 1 deletion
sources/LocalizationEditor.xcodeproj/xcshareddata/xcschemes/LocalizationEditor.xcscheme

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
 LastUpgradeVersion = "1310"
 LastUpgradeVersion = "1410"
 version = "1.3">
 <BuildAction
 parallelizeBuildables = "YES"
Expand Down

8 changes: 8 additions & 0 deletions
sources/LocalizationEditor/Extensions/String+Extensions.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,14 @@
import Foundation

extension String {
 func slice(from fromString: String, to toString: String) -> String? {
 return (range(of: fromString)?.upperBound).flatMap { substringFrom in
 (range(of: toString, range: substringFrom..<endIndex)?.lowerBound).map { substringTo in
 String(self[substringFrom..<substringTo])
 }
 }
 }

 var normalized: String {
 return folding(options: [.diacriticInsensitive, .caseInsensitive], locale: .current)
 }
Expand Down

2 changes: 1 addition & 1 deletion
sources/LocalizationEditor/Info.plist

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@
	<key>CFBundleShortVersionString</key>
	<string>$(MARKETING_VERSION)</string>
	<key>CFBundleVersion</key>
	<string>269</string>
	<string>319</string>
	<key>LSMinimumSystemVersion</key>
	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
	<key>NSHumanReadableCopyright</key>
Expand Down

12 changes: 9 additions & 3 deletions
sources/LocalizationEditor/Models/Localization.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,18 +23,24 @@ final class Localization {
 }

 func update(key: String, value: String, message: String?) {
 if let object = translations.first(where: { string in
 string.message != nil && string.message!.contains("\n ")
 }), let index = translations.firstIndex(of: object) {
 let setObject = LocalizationString(key: object.key, value: object.value, message: "/*[Header]\(object.message!.replacingOccurrences(of: "/*", with: "").replacingOccurrences(of: "*/", with: ""))*/")
 translations.insert(setObject, at: 0)
 translations.remove(at: index + 1)
 }
 if let existing = translations.first(where: { $0.key == key }) {
 existing.update(newValue: value)
 return
 }

 let newTranslation = LocalizationString(key: key, value: value, message: message)
 translations = (translations + [newTranslation]).sorted()
 translations.append(newTranslation)
 }

 func add(key: String, message: String?) -> LocalizationString {
 let newTranslation = LocalizationString(key: key, value: "", message: message)
 translations = (translations.filter({ $0.key != key }) + [newTranslation]).sorted()
 translations.append(newTranslation)
 return newTranslation
 }

Expand Down

18 changes: 10 additions & 8 deletions
sources/LocalizationEditor/Providers/LocalizationProvider.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,19 +49,21 @@ final class LocalizationProvider {
 private func writeToFile(localization: Localization) {
 let data = localization.translations.map { string -> String in
 let stringForMessage: String
 if let newMessage = string.message {
 stringForMessage = "/* \(newMessage) */"
 if let newMessage = string.message, newMessage.replacingOccurrences(of: " ", with: "") != "" {
 stringForMessage = "\n/* \(newMessage) */\n"
 } else {
 stringForMessage = ""
 }

 return """
 \(stringForMessage)
 \"\(string.key)\" = \"\(string.value.escaped)\";\n
 """
 if let originalMessage = string.message, originalMessage.contains("[Header]") {
 let topFormat = originalMessage.replacingOccurrences(of: "[Header]", with: "")
 let message = string.value.replacingOccurrences(of: topFormat, with: "")
 return "\(topFormat)\n\n\"\(string.key)\" = \"\(message.escaped)\";"
 } else {
 return "\(stringForMessage)\"\(string.key)\" = \"\(string.value.escaped)\";"
 }
 }.reduce("") { prev, next in
 "\(prev)\n\(next)"
 }
 }.replacingOccurrences(of: "\n/*", with: "/*")

 do {
 try data.write(toFile: localization.path, atomically: false, encoding: .utf8)
Expand Down

5 changes: 4 additions & 1 deletion
sources/LocalizationEditor/Providers/LocalizationsDataSource.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,7 +184,10 @@ final class LocalizationsDataSource: NSObject {
 guard let key = getKey(row: row), let part = data[key], let languageKey = mainLocalization?.language else {
 return nil
 }
 return part[languageKey]??.message
 guard let message = part[languageKey]??.message, !message.contains("\n ") else {
 return nil
 }
 return message
 }

 /**
Expand Down

6 changes: 3 additions & 3 deletions
sources/LocalizationEditor/UI/Base.lproj/Main.storyboard

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
 <dependencies>
 <deployment identifier="macosx"/>
 <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="20037"/>
 <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
 </dependencies>
 <scenes>
Expand DownExpand Up@@ -529,7 +529,7 @@ Gw
 </scene>
 </scenes>
 <resources>
 <image name="NSAddTemplate" width="14" height="13"/>
 <image name="NSAddTemplate" width="18" height="17"/>
 <image name="NSFolder" width="32" height="32"/>
 </resources>
</document>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Updated Formatting to now maintain Xcode formatting#104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

igorkulman
merged 14 commits into

from

Feb 12, 2023
 Merged


Updated Formatting to now maintain Xcode formatting
#104
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
42f15af

Formatting updates to maintain xcode format


Mcrich23 Jan 25, 2023
8ded344

Formatting Bug Fixes


Mcrich23 Jan 25, 2023
53d4d69

Silenced SwiftLint Warnings


Mcrich23 Jan 25, 2023
537bc39

Updated settings and reset bundle id


Mcrich23 Jan 25, 2023
4bf609c

set build number


Mcrich23 Jan 25, 2023
64d524a

Bug Fixes


Mcrich23 Jan 25, 2023
063d02a

Silenced SwiftLint warnings


Mcrich23 Jan 25, 2023
f1aa200

Silenced SwiftLint warnings


Mcrich23 Jan 25, 2023
f95b3d0

Update Info.plist


Mcrich23 Jan 25, 2023
722dc45

removed extra spacing


Mcrich23 Jan 25, 2023
57f67f2

Removed Header from comments in main view


Mcrich23 Jan 25, 2023
fa75259

Update Info.plist


Mcrich23 Jan 25, 2023
07f93b1

Bug Fixes


Mcrich23 Jan 25, 2023
80044eb

Update Info.plist


Mcrich23 Jan 25, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 15 additions & 3 deletions
sources/LocalizationEditor.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -352,7 +352,7 @@
 isa = PBXProject;
 attributes = {
 LastSwiftUpdateCheck = 1010;
 LastUpgradeCheck = 1310;
 LastUpgradeCheck = 1410;
 ORGANIZATIONNAME = "Igor Kulman";
 TargetAttributes = {
 F3D9C94120BEC7460081830A = {
Expand DownExpand Up@@ -579,6 +579,7 @@
 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 CODE_SIGN_IDENTITY = "-";
 COPY_PHASE_STRIP = NO;
 DEAD_CODE_STRIPPING = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;
 ENABLE_STRICT_OBJC_MSGSEND = YES;
 ENABLE_TESTABILITY = YES;
Expand DownExpand Up@@ -640,6 +641,7 @@
 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 CODE_SIGN_IDENTITY = "-";
 COPY_PHASE_STRIP = NO;
 DEAD_CODE_STRIPPING = YES;
 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 ENABLE_NS_ASSERTIONS = NO;
 ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand DownExpand Up@@ -667,14 +669,17 @@
 CODE_SIGN_IDENTITY = "-";
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 310;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = "";
 FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 INFOPLIST_FILE = LocalizationEditor/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/../Frameworks",
 );
 MARKETING_VERSION = 2.9;
 MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 MARKETING_VERSION = 2.9.1;
 PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditor;
 PRODUCT_NAME = "$(TARGET_NAME)";
 SWIFT_VERSION = 5.0;
Expand All@@ -689,14 +694,17 @@
 CODE_SIGN_IDENTITY = "-";
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 310;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = "";
 FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 INFOPLIST_FILE = LocalizationEditor/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/../Frameworks",
 );
 MARKETING_VERSION = 2.9;
 MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 MARKETING_VERSION = 2.9.1;
 PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditor;
 PRODUCT_NAME = "$(TARGET_NAME)";
 SWIFT_VERSION = 5.0;
Expand All@@ -710,13 +718,15 @@
 CLANG_ENABLE_OBJC_WEAK = YES;
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = S6EJ3ZVM4G;
 INFOPLIST_FILE = LocalizationEditorTests/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/../Frameworks",
 "@loader_path/../Frameworks",
 );
 MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 MTL_FAST_MATH = YES;
 PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditorTests;
Expand All@@ -733,13 +743,15 @@
 CLANG_ENABLE_OBJC_WEAK = YES;
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = S6EJ3ZVM4G;
 INFOPLIST_FILE = LocalizationEditorTests/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/../Frameworks",
 "@loader_path/../Frameworks",
 );
 MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 MTL_FAST_MATH = YES;
 PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditorTests;
 PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down

2 changes: 1 addition & 1 deletion
sources/LocalizationEditor.xcodeproj/xcshareddata/xcschemes/LocalizationEditor.xcscheme

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
 LastUpgradeVersion = "1310"
 LastUpgradeVersion = "1410"
 version = "1.3">
 <BuildAction
 parallelizeBuildables = "YES"
Expand Down

8 changes: 8 additions & 0 deletions
sources/LocalizationEditor/Extensions/String+Extensions.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,14 @@
import Foundation

extension String {
 func slice(from fromString: String, to toString: String) -> String? {
 return (range(of: fromString)?.upperBound).flatMap { substringFrom in
 (range(of: toString, range: substringFrom..<endIndex)?.lowerBound).map { substringTo in
 String(self[substringFrom..<substringTo])
 }
 }
 }

 var normalized: String {
 return folding(options: [.diacriticInsensitive, .caseInsensitive], locale: .current)
 }
Expand Down

2 changes: 1 addition & 1 deletion
sources/LocalizationEditor/Info.plist

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@
	<key>CFBundleShortVersionString</key>
	<string>$(MARKETING_VERSION)</string>
	<key>CFBundleVersion</key>
	<string>269</string>
	<string>319</string>
	<key>LSMinimumSystemVersion</key>
	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
	<key>NSHumanReadableCopyright</key>
Expand Down

12 changes: 9 additions & 3 deletions
sources/LocalizationEditor/Models/Localization.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,18 +23,24 @@ final class Localization {
 }

 func update(key: String, value: String, message: String?) {
 if let object = translations.first(where: { string in
 string.message != nil && string.message!.contains("\n ")
 }), let index = translations.firstIndex(of: object) {
 let setObject = LocalizationString(key: object.key, value: object.value, message: "/*[Header]\(object.message!.replacingOccurrences(of: "/*", with: "").replacingOccurrences(of: "*/", with: ""))*/")
 translations.insert(setObject, at: 0)
 translations.remove(at: index + 1)
 }
 if let existing = translations.first(where: { $0.key == key }) {
 existing.update(newValue: value)
 return
 }

 let newTranslation = LocalizationString(key: key, value: value, message: message)
 translations = (translations + [newTranslation]).sorted()
 translations.append(newTranslation)
 }

 func add(key: String, message: String?) -> LocalizationString {
 let newTranslation = LocalizationString(key: key, value: "", message: message)
 translations = (translations.filter({ $0.key != key }) + [newTranslation]).sorted()
 translations.append(newTranslation)
 return newTranslation
 }

Expand Down

18 changes: 10 additions & 8 deletions
sources/LocalizationEditor/Providers/LocalizationProvider.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,19 +49,21 @@ final class LocalizationProvider {
 private func writeToFile(localization: Localization) {
 let data = localization.translations.map { string -> String in
 let stringForMessage: String
 if let newMessage = string.message {
 stringForMessage = "/* \(newMessage) */"
 if let newMessage = string.message, newMessage.replacingOccurrences(of: " ", with: "") != "" {
 stringForMessage = "\n/* \(newMessage) */\n"
 } else {
 stringForMessage = ""
 }

 return """
 \(stringForMessage)
 \"\(string.key)\" = \"\(string.value.escaped)\";\n
 """
 if let originalMessage = string.message, originalMessage.contains("[Header]") {
 let topFormat = originalMessage.replacingOccurrences(of: "[Header]", with: "")
 let message = string.value.replacingOccurrences(of: topFormat, with: "")
 return "\(topFormat)\n\n\"\(string.key)\" = \"\(message.escaped)\";"
 } else {
 return "\(stringForMessage)\"\(string.key)\" = \"\(string.value.escaped)\";"
 }
 }.reduce("") { prev, next in
 "\(prev)\n\(next)"
 }
 }.replacingOccurrences(of: "\n/*", with: "/*")

 do {
 try data.write(toFile: localization.path, atomically: false, encoding: .utf8)
Expand Down

5 changes: 4 additions & 1 deletion
sources/LocalizationEditor/Providers/LocalizationsDataSource.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,7 +184,10 @@ final class LocalizationsDataSource: NSObject {
 guard let key = getKey(row: row), let part = data[key], let languageKey = mainLocalization?.language else {
 return nil
 }
 return part[languageKey]??.message
 guard let message = part[languageKey]??.message, !message.contains("\n ") else {
 return nil
 }
 return message
 }

 /**
Expand Down

6 changes: 3 additions & 3 deletions
sources/LocalizationEditor/UI/Base.lproj/Main.storyboard

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
 <dependencies>
 <deployment identifier="macosx"/>
 <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="20037"/>
 <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
 </dependencies>
 <scenes>
Expand DownExpand Up@@ -529,7 +529,7 @@ Gw
 </scene>
 </scenes>
 <resources>
 <image name="NSAddTemplate" width="14" height="13"/>
 <image name="NSAddTemplate" width="18" height="17"/>
 <image name="NSFolder" width="32" height="32"/>
 </resources>
</document>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Updated Formatting to now maintain Xcode formatting#104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

igorkulman
merged 14 commits into

from

Feb 12, 2023
 Merged


Updated Formatting to now maintain Xcode formatting
#104
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
42f15af

Formatting updates to maintain xcode format


Mcrich23 Jan 25, 2023
8ded344

Formatting Bug Fixes


Mcrich23 Jan 25, 2023
53d4d69

Silenced SwiftLint Warnings


Mcrich23 Jan 25, 2023
537bc39

Updated settings and reset bundle id


Mcrich23 Jan 25, 2023
4bf609c

set build number


Mcrich23 Jan 25, 2023
64d524a

Bug Fixes


Mcrich23 Jan 25, 2023
063d02a

Silenced SwiftLint warnings


Mcrich23 Jan 25, 2023
f1aa200

Silenced SwiftLint warnings


Mcrich23 Jan 25, 2023
f95b3d0

Update Info.plist


Mcrich23 Jan 25, 2023
722dc45

removed extra spacing


Mcrich23 Jan 25, 2023
57f67f2

Removed Header from comments in main view


Mcrich23 Jan 25, 2023
fa75259

Update Info.plist


Mcrich23 Jan 25, 2023
07f93b1

Bug Fixes


Mcrich23 Jan 25, 2023
80044eb

Update Info.plist


Mcrich23 Jan 25, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 15 additions & 3 deletions
sources/LocalizationEditor.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -352,7 +352,7 @@
 isa = PBXProject;
 attributes = {
 LastSwiftUpdateCheck = 1010;
 LastUpgradeCheck = 1310;
 LastUpgradeCheck = 1410;
 ORGANIZATIONNAME = "Igor Kulman";
 TargetAttributes = {
 F3D9C94120BEC7460081830A = {
Expand DownExpand Up@@ -579,6 +579,7 @@
 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 CODE_SIGN_IDENTITY = "-";
 COPY_PHASE_STRIP = NO;
 DEAD_CODE_STRIPPING = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;
 ENABLE_STRICT_OBJC_MSGSEND = YES;
 ENABLE_TESTABILITY = YES;
Expand DownExpand Up@@ -640,6 +641,7 @@
 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 CODE_SIGN_IDENTITY = "-";
 COPY_PHASE_STRIP = NO;
 DEAD_CODE_STRIPPING = YES;
 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 ENABLE_NS_ASSERTIONS = NO;
 ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand DownExpand Up@@ -667,14 +669,17 @@
 CODE_SIGN_IDENTITY = "-";
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 310;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = "";
 FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 INFOPLIST_FILE = LocalizationEditor/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/../Frameworks",
 );
 MARKETING_VERSION = 2.9;
 MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 MARKETING_VERSION = 2.9.1;
 PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditor;
 PRODUCT_NAME = "$(TARGET_NAME)";
 SWIFT_VERSION = 5.0;
Expand All@@ -689,14 +694,17 @@
 CODE_SIGN_IDENTITY = "-";
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 310;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = "";
 FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 INFOPLIST_FILE = LocalizationEditor/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/../Frameworks",
 );
 MARKETING_VERSION = 2.9;
 MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 MARKETING_VERSION = 2.9.1;
 PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditor;
 PRODUCT_NAME = "$(TARGET_NAME)";
 SWIFT_VERSION = 5.0;
Expand All@@ -710,13 +718,15 @@
 CLANG_ENABLE_OBJC_WEAK = YES;
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = S6EJ3ZVM4G;
 INFOPLIST_FILE = LocalizationEditorTests/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/../Frameworks",
 "@loader_path/../Frameworks",
 );
 MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 MTL_FAST_MATH = YES;
 PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditorTests;
Expand All@@ -733,13 +743,15 @@
 CLANG_ENABLE_OBJC_WEAK = YES;
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = S6EJ3ZVM4G;
 INFOPLIST_FILE = LocalizationEditorTests/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/../Frameworks",
 "@loader_path/../Frameworks",
 );
 MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 MTL_FAST_MATH = YES;
 PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditorTests;
 PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down

2 changes: 1 addition & 1 deletion
sources/LocalizationEditor.xcodeproj/xcshareddata/xcschemes/LocalizationEditor.xcscheme

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
 LastUpgradeVersion = "1310"
 LastUpgradeVersion = "1410"
 version = "1.3">
 <BuildAction
 parallelizeBuildables = "YES"
Expand Down

8 changes: 8 additions & 0 deletions
sources/LocalizationEditor/Extensions/String+Extensions.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,14 @@
import Foundation

extension String {
 func slice(from fromString: String, to toString: String) -> String? {
 return (range(of: fromString)?.upperBound).flatMap { substringFrom in
 (range(of: toString, range: substringFrom..<endIndex)?.lowerBound).map { substringTo in
 String(self[substringFrom..<substringTo])
 }
 }
 }

 var normalized: String {
 return folding(options: [.diacriticInsensitive, .caseInsensitive], locale: .current)
 }
Expand Down

2 changes: 1 addition & 1 deletion
sources/LocalizationEditor/Info.plist

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@
	<key>CFBundleShortVersionString</key>
	<string>$(MARKETING_VERSION)</string>
	<key>CFBundleVersion</key>
	<string>269</string>
	<string>319</string>
	<key>LSMinimumSystemVersion</key>
	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
	<key>NSHumanReadableCopyright</key>
Expand Down

12 changes: 9 additions & 3 deletions
sources/LocalizationEditor/Models/Localization.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,18 +23,24 @@ final class Localization {
 }

 func update(key: String, value: String, message: String?) {
 if let object = translations.first(where: { string in
 string.message != nil && string.message!.contains("\n ")
 }), let index = translations.firstIndex(of: object) {
 let setObject = LocalizationString(key: object.key, value: object.value, message: "/*[Header]\(object.message!.replacingOccurrences(of: "/*", with: "").replacingOccurrences(of: "*/", with: ""))*/")
 translations.insert(setObject, at: 0)
 translations.remove(at: index + 1)
 }
 if let existing = translations.first(where: { $0.key == key }) {
 existing.update(newValue: value)
 return
 }

 let newTranslation = LocalizationString(key: key, value: value, message: message)
 translations = (translations + [newTranslation]).sorted()
 translations.append(newTranslation)
 }

 func add(key: String, message: String?) -> LocalizationString {
 let newTranslation = LocalizationString(key: key, value: "", message: message)
 translations = (translations.filter({ $0.key != key }) + [newTranslation]).sorted()
 translations.append(newTranslation)
 return newTranslation
 }

Expand Down

18 changes: 10 additions & 8 deletions
sources/LocalizationEditor/Providers/LocalizationProvider.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,19 +49,21 @@ final class LocalizationProvider {
 private func writeToFile(localization: Localization) {
 let data = localization.translations.map { string -> String in
 let stringForMessage: String
 if let newMessage = string.message {
 stringForMessage = "/* \(newMessage) */"
 if let newMessage = string.message, newMessage.replacingOccurrences(of: " ", with: "") != "" {
 stringForMessage = "\n/* \(newMessage) */\n"
 } else {
 stringForMessage = ""
 }

 return """
 \(stringForMessage)
 \"\(string.key)\" = \"\(string.value.escaped)\";\n
 """
 if let originalMessage = string.message, originalMessage.contains("[Header]") {
 let topFormat = originalMessage.replacingOccurrences(of: "[Header]", with: "")
 let message = string.value.replacingOccurrences(of: topFormat, with: "")
 return "\(topFormat)\n\n\"\(string.key)\" = \"\(message.escaped)\";"
 } else {
 return "\(stringForMessage)\"\(string.key)\" = \"\(string.value.escaped)\";"
 }
 }.reduce("") { prev, next in
 "\(prev)\n\(next)"
 }
 }.replacingOccurrences(of: "\n/*", with: "/*")

 do {
 try data.write(toFile: localization.path, atomically: false, encoding: .utf8)
Expand Down

5 changes: 4 additions & 1 deletion
sources/LocalizationEditor/Providers/LocalizationsDataSource.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,7 +184,10 @@ final class LocalizationsDataSource: NSObject {
 guard let key = getKey(row: row), let part = data[key], let languageKey = mainLocalization?.language else {
 return nil
 }
 return part[languageKey]??.message
 guard let message = part[languageKey]??.message, !message.contains("\n ") else {
 return nil
 }
 return message
 }

 /**
Expand Down

6 changes: 3 additions & 3 deletions
sources/LocalizationEditor/UI/Base.lproj/Main.storyboard

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
 <dependencies>
 <deployment identifier="macosx"/>
 <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="20037"/>
 <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
 </dependencies>
 <scenes>
Expand DownExpand Up@@ -529,7 +529,7 @@ Gw
 </scene>
 </scenes>
 <resources>
 <image name="NSAddTemplate" width="14" height="13"/>
 <image name="NSAddTemplate" width="18" height="17"/>
 <image name="NSFolder" width="32" height="32"/>
 </resources>
</document>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Updated Formatting to now maintain Xcode formatting#104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

igorkulman
merged 14 commits into

from

Feb 12, 2023
 Merged


Updated Formatting to now maintain Xcode formatting
#104
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
42f15af

Formatting updates to maintain xcode format


Mcrich23 Jan 25, 2023
8ded344

Formatting Bug Fixes


Mcrich23 Jan 25, 2023
53d4d69

Silenced SwiftLint Warnings


Mcrich23 Jan 25, 2023
537bc39

Updated settings and reset bundle id


Mcrich23 Jan 25, 2023
4bf609c

set build number


Mcrich23 Jan 25, 2023
64d524a

Bug Fixes


Mcrich23 Jan 25, 2023
063d02a

Silenced SwiftLint warnings


Mcrich23 Jan 25, 2023
f1aa200

Silenced SwiftLint warnings


Mcrich23 Jan 25, 2023
f95b3d0

Update Info.plist


Mcrich23 Jan 25, 2023
722dc45

removed extra spacing


Mcrich23 Jan 25, 2023
57f67f2

Removed Header from comments in main view


Mcrich23 Jan 25, 2023
fa75259

Update Info.plist


Mcrich23 Jan 25, 2023
07f93b1

Bug Fixes


Mcrich23 Jan 25, 2023
80044eb

Update Info.plist


Mcrich23 Jan 25, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 15 additions & 3 deletions
sources/LocalizationEditor.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -352,7 +352,7 @@
 isa = PBXProject;
 attributes = {
 LastSwiftUpdateCheck = 1010;
 LastUpgradeCheck = 1310;
 LastUpgradeCheck = 1410;
 ORGANIZATIONNAME = "Igor Kulman";
 TargetAttributes = {
 F3D9C94120BEC7460081830A = {
Expand DownExpand Up@@ -579,6 +579,7 @@
 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 CODE_SIGN_IDENTITY = "-";
 COPY_PHASE_STRIP = NO;
 DEAD_CODE_STRIPPING = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;
 ENABLE_STRICT_OBJC_MSGSEND = YES;
 ENABLE_TESTABILITY = YES;
Expand DownExpand Up@@ -640,6 +641,7 @@
 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 CODE_SIGN_IDENTITY = "-";
 COPY_PHASE_STRIP = NO;
 DEAD_CODE_STRIPPING = YES;
 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 ENABLE_NS_ASSERTIONS = NO;
 ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand DownExpand Up@@ -667,14 +669,17 @@
 CODE_SIGN_IDENTITY = "-";
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 310;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = "";
 FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 INFOPLIST_FILE = LocalizationEditor/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/../Frameworks",
 );
 MARKETING_VERSION = 2.9;
 MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 MARKETING_VERSION = 2.9.1;
 PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditor;
 PRODUCT_NAME = "$(TARGET_NAME)";
 SWIFT_VERSION = 5.0;
Expand All@@ -689,14 +694,17 @@
 CODE_SIGN_IDENTITY = "-";
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 310;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = "";
 FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 INFOPLIST_FILE = LocalizationEditor/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/../Frameworks",
 );
 MARKETING_VERSION = 2.9;
 MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 MARKETING_VERSION = 2.9.1;
 PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditor;
 PRODUCT_NAME = "$(TARGET_NAME)";
 SWIFT_VERSION = 5.0;
Expand All@@ -710,13 +718,15 @@
 CLANG_ENABLE_OBJC_WEAK = YES;
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = S6EJ3ZVM4G;
 INFOPLIST_FILE = LocalizationEditorTests/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/../Frameworks",
 "@loader_path/../Frameworks",
 );
 MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 MTL_FAST_MATH = YES;
 PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditorTests;
Expand All@@ -733,13 +743,15 @@
 CLANG_ENABLE_OBJC_WEAK = YES;
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = S6EJ3ZVM4G;
 INFOPLIST_FILE = LocalizationEditorTests/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/../Frameworks",
 "@loader_path/../Frameworks",
 );
 MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 MTL_FAST_MATH = YES;
 PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditorTests;
 PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down

2 changes: 1 addition & 1 deletion
sources/LocalizationEditor.xcodeproj/xcshareddata/xcschemes/LocalizationEditor.xcscheme

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
 LastUpgradeVersion = "1310"
 LastUpgradeVersion = "1410"
 version = "1.3">
 <BuildAction
 parallelizeBuildables = "YES"
Expand Down

8 changes: 8 additions & 0 deletions
sources/LocalizationEditor/Extensions/String+Extensions.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,14 @@
import Foundation

extension String {
 func slice(from fromString: String, to toString: String) -> String? {
 return (range(of: fromString)?.upperBound).flatMap { substringFrom in
 (range(of: toString, range: substringFrom..<endIndex)?.lowerBound).map { substringTo in
 String(self[substringFrom..<substringTo])
 }
 }
 }

 var normalized: String {
 return folding(options: [.diacriticInsensitive, .caseInsensitive], locale: .current)
 }
Expand Down

2 changes: 1 addition & 1 deletion
sources/LocalizationEditor/Info.plist

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@
	<key>CFBundleShortVersionString</key>
	<string>$(MARKETING_VERSION)</string>
	<key>CFBundleVersion</key>
	<string>269</string>
	<string>319</string>
	<key>LSMinimumSystemVersion</key>
	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
	<key>NSHumanReadableCopyright</key>
Expand Down

12 changes: 9 additions & 3 deletions
sources/LocalizationEditor/Models/Localization.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,18 +23,24 @@ final class Localization {
 }

 func update(key: String, value: String, message: String?) {
 if let object = translations.first(where: { string in
 string.message != nil && string.message!.contains("\n ")
 }), let index = translations.firstIndex(of: object) {
 let setObject = LocalizationString(key: object.key, value: object.value, message: "/*[Header]\(object.message!.replacingOccurrences(of: "/*", with: "").replacingOccurrences(of: "*/", with: ""))*/")
 translations.insert(setObject, at: 0)
 translations.remove(at: index + 1)
 }
 if let existing = translations.first(where: { $0.key == key }) {
 existing.update(newValue: value)
 return
 }

 let newTranslation = LocalizationString(key: key, value: value, message: message)
 translations = (translations + [newTranslation]).sorted()
 translations.append(newTranslation)
 }

 func add(key: String, message: String?) -> LocalizationString {
 let newTranslation = LocalizationString(key: key, value: "", message: message)
 translations = (translations.filter({ $0.key != key }) + [newTranslation]).sorted()
 translations.append(newTranslation)
 return newTranslation
 }

Expand Down

18 changes: 10 additions & 8 deletions
sources/LocalizationEditor/Providers/LocalizationProvider.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,19 +49,21 @@ final class LocalizationProvider {
 private func writeToFile(localization: Localization) {
 let data = localization.translations.map { string -> String in
 let stringForMessage: String
 if let newMessage = string.message {
 stringForMessage = "/* \(newMessage) */"
 if let newMessage = string.message, newMessage.replacingOccurrences(of: " ", with: "") != "" {
 stringForMessage = "\n/* \(newMessage) */\n"
 } else {
 stringForMessage = ""
 }

 return """
 \(stringForMessage)
 \"\(string.key)\" = \"\(string.value.escaped)\";\n
 """
 if let originalMessage = string.message, originalMessage.contains("[Header]") {
 let topFormat = originalMessage.replacingOccurrences(of: "[Header]", with: "")
 let message = string.value.replacingOccurrences(of: topFormat, with: "")
 return "\(topFormat)\n\n\"\(string.key)\" = \"\(message.escaped)\";"
 } else {
 return "\(stringForMessage)\"\(string.key)\" = \"\(string.value.escaped)\";"
 }
 }.reduce("") { prev, next in
 "\(prev)\n\(next)"
 }
 }.replacingOccurrences(of: "\n/*", with: "/*")

 do {
 try data.write(toFile: localization.path, atomically: false, encoding: .utf8)
Expand Down

5 changes: 4 additions & 1 deletion
sources/LocalizationEditor/Providers/LocalizationsDataSource.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,7 +184,10 @@ final class LocalizationsDataSource: NSObject {
 guard let key = getKey(row: row), let part = data[key], let languageKey = mainLocalization?.language else {
 return nil
 }
 return part[languageKey]??.message
 guard let message = part[languageKey]??.message, !message.contains("\n ") else {
 return nil
 }
 return message
 }

 /**
Expand Down

6 changes: 3 additions & 3 deletions
sources/LocalizationEditor/UI/Base.lproj/Main.storyboard

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
 <dependencies>
 <deployment identifier="macosx"/>
 <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="20037"/>
 <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
 </dependencies>
 <scenes>
Expand DownExpand Up@@ -529,7 +529,7 @@ Gw
 </scene>
 </scenes>
 <resources>
 <image name="NSAddTemplate" width="14" height="13"/>
 <image name="NSAddTemplate" width="18" height="17"/>
 <image name="NSFolder" width="32" height="32"/>
 </resources>
</document>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Updated Formatting to now maintain Xcode formatting#104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

igorkulman
merged 14 commits into

from

Feb 12, 2023
 Merged


Updated Formatting to now maintain Xcode formatting
#104
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
42f15af

Formatting updates to maintain xcode format


Mcrich23 Jan 25, 2023
8ded344

Formatting Bug Fixes


Mcrich23 Jan 25, 2023
53d4d69

Silenced SwiftLint Warnings


Mcrich23 Jan 25, 2023
537bc39

Updated settings and reset bundle id


Mcrich23 Jan 25, 2023
4bf609c

set build number


Mcrich23 Jan 25, 2023
64d524a

Bug Fixes


Mcrich23 Jan 25, 2023
063d02a

Silenced SwiftLint warnings


Mcrich23 Jan 25, 2023
f1aa200

Silenced SwiftLint warnings


Mcrich23 Jan 25, 2023
f95b3d0

Update Info.plist


Mcrich23 Jan 25, 2023
722dc45

removed extra spacing


Mcrich23 Jan 25, 2023
57f67f2

Removed Header from comments in main view


Mcrich23 Jan 25, 2023
fa75259

Update Info.plist


Mcrich23 Jan 25, 2023
07f93b1

Bug Fixes


Mcrich23 Jan 25, 2023
80044eb

Update Info.plist


Mcrich23 Jan 25, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 15 additions & 3 deletions
sources/LocalizationEditor.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -352,7 +352,7 @@
 isa = PBXProject;
 attributes = {
 LastSwiftUpdateCheck = 1010;
 LastUpgradeCheck = 1310;
 LastUpgradeCheck = 1410;
 ORGANIZATIONNAME = "Igor Kulman";
 TargetAttributes = {
 F3D9C94120BEC7460081830A = {
Expand DownExpand Up@@ -579,6 +579,7 @@
 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 CODE_SIGN_IDENTITY = "-";
 COPY_PHASE_STRIP = NO;
 DEAD_CODE_STRIPPING = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;
 ENABLE_STRICT_OBJC_MSGSEND = YES;
 ENABLE_TESTABILITY = YES;
Expand DownExpand Up@@ -640,6 +641,7 @@
 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 CODE_SIGN_IDENTITY = "-";
 COPY_PHASE_STRIP = NO;
 DEAD_CODE_STRIPPING = YES;
 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 ENABLE_NS_ASSERTIONS = NO;
 ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand DownExpand Up@@ -667,14 +669,17 @@
 CODE_SIGN_IDENTITY = "-";
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 310;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = "";
 FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 INFOPLIST_FILE = LocalizationEditor/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/../Frameworks",
 );
 MARKETING_VERSION = 2.9;
 MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 MARKETING_VERSION = 2.9.1;
 PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditor;
 PRODUCT_NAME = "$(TARGET_NAME)";
 SWIFT_VERSION = 5.0;
Expand All@@ -689,14 +694,17 @@
 CODE_SIGN_IDENTITY = "-";
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 310;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = "";
 FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 INFOPLIST_FILE = LocalizationEditor/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/../Frameworks",
 );
 MARKETING_VERSION = 2.9;
 MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 MARKETING_VERSION = 2.9.1;
 PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditor;
 PRODUCT_NAME = "$(TARGET_NAME)";
 SWIFT_VERSION = 5.0;
Expand All@@ -710,13 +718,15 @@
 CLANG_ENABLE_OBJC_WEAK = YES;
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = S6EJ3ZVM4G;
 INFOPLIST_FILE = LocalizationEditorTests/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/../Frameworks",
 "@loader_path/../Frameworks",
 );
 MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 MTL_FAST_MATH = YES;
 PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditorTests;
Expand All@@ -733,13 +743,15 @@
 CLANG_ENABLE_OBJC_WEAK = YES;
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = S6EJ3ZVM4G;
 INFOPLIST_FILE = LocalizationEditorTests/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/../Frameworks",
 "@loader_path/../Frameworks",
 );
 MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 MTL_FAST_MATH = YES;
 PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditorTests;
 PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down

2 changes: 1 addition & 1 deletion
sources/LocalizationEditor.xcodeproj/xcshareddata/xcschemes/LocalizationEditor.xcscheme

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
 LastUpgradeVersion = "1310"
 LastUpgradeVersion = "1410"
 version = "1.3">
 <BuildAction
 parallelizeBuildables = "YES"
Expand Down

8 changes: 8 additions & 0 deletions
sources/LocalizationEditor/Extensions/String+Extensions.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,14 @@
import Foundation

extension String {
 func slice(from fromString: String, to toString: String) -> String? {
 return (range(of: fromString)?.upperBound).flatMap { substringFrom in
 (range(of: toString, range: substringFrom..<endIndex)?.lowerBound).map { substringTo in
 String(self[substringFrom..<substringTo])
 }
 }
 }

 var normalized: String {
 return folding(options: [.diacriticInsensitive, .caseInsensitive], locale: .current)
 }
Expand Down

2 changes: 1 addition & 1 deletion
sources/LocalizationEditor/Info.plist

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@
	<key>CFBundleShortVersionString</key>
	<string>$(MARKETING_VERSION)</string>
	<key>CFBundleVersion</key>
	<string>269</string>
	<string>319</string>
	<key>LSMinimumSystemVersion</key>
	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
	<key>NSHumanReadableCopyright</key>
Expand Down

12 changes: 9 additions & 3 deletions
sources/LocalizationEditor/Models/Localization.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,18 +23,24 @@ final class Localization {
 }

 func update(key: String, value: String, message: String?) {
 if let object = translations.first(where: { string in
 string.message != nil && string.message!.contains("\n ")
 }), let index = translations.firstIndex(of: object) {
 let setObject = LocalizationString(key: object.key, value: object.value, message: "/*[Header]\(object.message!.replacingOccurrences(of: "/*", with: "").replacingOccurrences(of: "*/", with: ""))*/")
 translations.insert(setObject, at: 0)
 translations.remove(at: index + 1)
 }
 if let existing = translations.first(where: { $0.key == key }) {
 existing.update(newValue: value)
 return
 }

 let newTranslation = LocalizationString(key: key, value: value, message: message)
 translations = (translations + [newTranslation]).sorted()
 translations.append(newTranslation)
 }

 func add(key: String, message: String?) -> LocalizationString {
 let newTranslation = LocalizationString(key: key, value: "", message: message)
 translations = (translations.filter({ $0.key != key }) + [newTranslation]).sorted()
 translations.append(newTranslation)
 return newTranslation
 }

Expand Down

18 changes: 10 additions & 8 deletions
sources/LocalizationEditor/Providers/LocalizationProvider.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,19 +49,21 @@ final class LocalizationProvider {
 private func writeToFile(localization: Localization) {
 let data = localization.translations.map { string -> String in
 let stringForMessage: String
 if let newMessage = string.message {
 stringForMessage = "/* \(newMessage) */"
 if let newMessage = string.message, newMessage.replacingOccurrences(of: " ", with: "") != "" {
 stringForMessage = "\n/* \(newMessage) */\n"
 } else {
 stringForMessage = ""
 }

 return """
 \(stringForMessage)
 \"\(string.key)\" = \"\(string.value.escaped)\";\n
 """
 if let originalMessage = string.message, originalMessage.contains("[Header]") {
 let topFormat = originalMessage.replacingOccurrences(of: "[Header]", with: "")
 let message = string.value.replacingOccurrences(of: topFormat, with: "")
 return "\(topFormat)\n\n\"\(string.key)\" = \"\(message.escaped)\";"
 } else {
 return "\(stringForMessage)\"\(string.key)\" = \"\(string.value.escaped)\";"
 }
 }.reduce("") { prev, next in
 "\(prev)\n\(next)"
 }
 }.replacingOccurrences(of: "\n/*", with: "/*")

 do {
 try data.write(toFile: localization.path, atomically: false, encoding: .utf8)
Expand Down

5 changes: 4 additions & 1 deletion
sources/LocalizationEditor/Providers/LocalizationsDataSource.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,7 +184,10 @@ final class LocalizationsDataSource: NSObject {
 guard let key = getKey(row: row), let part = data[key], let languageKey = mainLocalization?.language else {
 return nil
 }
 return part[languageKey]??.message
 guard let message = part[languageKey]??.message, !message.contains("\n ") else {
 return nil
 }
 return message
 }

 /**
Expand Down

6 changes: 3 additions & 3 deletions
sources/LocalizationEditor/UI/Base.lproj/Main.storyboard

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
 <dependencies>
 <deployment identifier="macosx"/>
 <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="20037"/>
 <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
 </dependencies>
 <scenes>
Expand DownExpand Up@@ -529,7 +529,7 @@ Gw
 </scene>
 </scenes>
 <resources>
 <image name="NSAddTemplate" width="14" height="13"/>
 <image name="NSAddTemplate" width="18" height="17"/>
 <image name="NSFolder" width="32" height="32"/>
 </resources>
</document>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Updated Formatting to now maintain Xcode formatting#104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

igorkulman
merged 14 commits into

from

Feb 12, 2023
 Merged


Updated Formatting to now maintain Xcode formatting
#104
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
42f15af

Formatting updates to maintain xcode format


Mcrich23 Jan 25, 2023
8ded344

Formatting Bug Fixes


Mcrich23 Jan 25, 2023
53d4d69

Silenced SwiftLint Warnings


Mcrich23 Jan 25, 2023
537bc39

Updated settings and reset bundle id


Mcrich23 Jan 25, 2023
4bf609c

set build number


Mcrich23 Jan 25, 2023
64d524a

Bug Fixes


Mcrich23 Jan 25, 2023
063d02a

Silenced SwiftLint warnings


Mcrich23 Jan 25, 2023
f1aa200

Silenced SwiftLint warnings


Mcrich23 Jan 25, 2023
f95b3d0

Update Info.plist


Mcrich23 Jan 25, 2023
722dc45

removed extra spacing


Mcrich23 Jan 25, 2023
57f67f2

Removed Header from comments in main view


Mcrich23 Jan 25, 2023
fa75259

Update Info.plist


Mcrich23 Jan 25, 2023
07f93b1

Bug Fixes


Mcrich23 Jan 25, 2023
80044eb

Update Info.plist


Mcrich23 Jan 25, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 15 additions & 3 deletions
sources/LocalizationEditor.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -352,7 +352,7 @@
 isa = PBXProject;
 attributes = {
 LastSwiftUpdateCheck = 1010;
 LastUpgradeCheck = 1310;
 LastUpgradeCheck = 1410;
 ORGANIZATIONNAME = "Igor Kulman";
 TargetAttributes = {
 F3D9C94120BEC7460081830A = {
Expand DownExpand Up@@ -579,6 +579,7 @@
 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 CODE_SIGN_IDENTITY = "-";
 COPY_PHASE_STRIP = NO;
 DEAD_CODE_STRIPPING = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;
 ENABLE_STRICT_OBJC_MSGSEND = YES;
 ENABLE_TESTABILITY = YES;
Expand DownExpand Up@@ -640,6 +641,7 @@
 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 CODE_SIGN_IDENTITY = "-";
 COPY_PHASE_STRIP = NO;
 DEAD_CODE_STRIPPING = YES;
 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 ENABLE_NS_ASSERTIONS = NO;
 ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand DownExpand Up@@ -667,14 +669,17 @@
 CODE_SIGN_IDENTITY = "-";
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 310;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = "";
 FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 INFOPLIST_FILE = LocalizationEditor/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/../Frameworks",
 );
 MARKETING_VERSION = 2.9;
 MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 MARKETING_VERSION = 2.9.1;
 PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditor;
 PRODUCT_NAME = "$(TARGET_NAME)";
 SWIFT_VERSION = 5.0;
Expand All@@ -689,14 +694,17 @@
 CODE_SIGN_IDENTITY = "-";
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 310;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = "";
 FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 INFOPLIST_FILE = LocalizationEditor/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/../Frameworks",
 );
 MARKETING_VERSION = 2.9;
 MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 MARKETING_VERSION = 2.9.1;
 PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditor;
 PRODUCT_NAME = "$(TARGET_NAME)";
 SWIFT_VERSION = 5.0;
Expand All@@ -710,13 +718,15 @@
 CLANG_ENABLE_OBJC_WEAK = YES;
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = S6EJ3ZVM4G;
 INFOPLIST_FILE = LocalizationEditorTests/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/../Frameworks",
 "@loader_path/../Frameworks",
 );
 MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 MTL_FAST_MATH = YES;
 PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditorTests;
Expand All@@ -733,13 +743,15 @@
 CLANG_ENABLE_OBJC_WEAK = YES;
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = S6EJ3ZVM4G;
 INFOPLIST_FILE = LocalizationEditorTests/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/../Frameworks",
 "@loader_path/../Frameworks",
 );
 MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 MTL_FAST_MATH = YES;
 PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditorTests;
 PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down

2 changes: 1 addition & 1 deletion
sources/LocalizationEditor.xcodeproj/xcshareddata/xcschemes/LocalizationEditor.xcscheme

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
 LastUpgradeVersion = "1310"
 LastUpgradeVersion = "1410"
 version = "1.3">
 <BuildAction
 parallelizeBuildables = "YES"
Expand Down

8 changes: 8 additions & 0 deletions
sources/LocalizationEditor/Extensions/String+Extensions.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,14 @@
import Foundation

extension String {
 func slice(from fromString: String, to toString: String) -> String? {
 return (range(of: fromString)?.upperBound).flatMap { substringFrom in
 (range(of: toString, range: substringFrom..<endIndex)?.lowerBound).map { substringTo in
 String(self[substringFrom..<substringTo])
 }
 }
 }

 var normalized: String {
 return folding(options: [.diacriticInsensitive, .caseInsensitive], locale: .current)
 }
Expand Down

2 changes: 1 addition & 1 deletion
sources/LocalizationEditor/Info.plist

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@
	<key>CFBundleShortVersionString</key>
	<string>$(MARKETING_VERSION)</string>
	<key>CFBundleVersion</key>
	<string>269</string>
	<string>319</string>
	<key>LSMinimumSystemVersion</key>
	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
	<key>NSHumanReadableCopyright</key>
Expand Down

12 changes: 9 additions & 3 deletions
sources/LocalizationEditor/Models/Localization.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,18 +23,24 @@ final class Localization {
 }

 func update(key: String, value: String, message: String?) {
 if let object = translations.first(where: { string in
 string.message != nil && string.message!.contains("\n ")
 }), let index = translations.firstIndex(of: object) {
 let setObject = LocalizationString(key: object.key, value: object.value, message: "/*[Header]\(object.message!.replacingOccurrences(of: "/*", with: "").replacingOccurrences(of: "*/", with: ""))*/")
 translations.insert(setObject, at: 0)
 translations.remove(at: index + 1)
 }
 if let existing = translations.first(where: { $0.key == key }) {
 existing.update(newValue: value)
 return
 }

 let newTranslation = LocalizationString(key: key, value: value, message: message)
 translations = (translations + [newTranslation]).sorted()
 translations.append(newTranslation)
 }

 func add(key: String, message: String?) -> LocalizationString {
 let newTranslation = LocalizationString(key: key, value: "", message: message)
 translations = (translations.filter({ $0.key != key }) + [newTranslation]).sorted()
 translations.append(newTranslation)
 return newTranslation
 }

Expand Down

18 changes: 10 additions & 8 deletions
sources/LocalizationEditor/Providers/LocalizationProvider.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,19 +49,21 @@ final class LocalizationProvider {
 private func writeToFile(localization: Localization) {
 let data = localization.translations.map { string -> String in
 let stringForMessage: String
 if let newMessage = string.message {
 stringForMessage = "/* \(newMessage) */"
 if let newMessage = string.message, newMessage.replacingOccurrences(of: " ", with: "") != "" {
 stringForMessage = "\n/* \(newMessage) */\n"
 } else {
 stringForMessage = ""
 }

 return """
 \(stringForMessage)
 \"\(string.key)\" = \"\(string.value.escaped)\";\n
 """
 if let originalMessage = string.message, originalMessage.contains("[Header]") {
 let topFormat = originalMessage.replacingOccurrences(of: "[Header]", with: "")
 let message = string.value.replacingOccurrences(of: topFormat, with: "")
 return "\(topFormat)\n\n\"\(string.key)\" = \"\(message.escaped)\";"
 } else {
 return "\(stringForMessage)\"\(string.key)\" = \"\(string.value.escaped)\";"
 }
 }.reduce("") { prev, next in
 "\(prev)\n\(next)"
 }
 }.replacingOccurrences(of: "\n/*", with: "/*")

 do {
 try data.write(toFile: localization.path, atomically: false, encoding: .utf8)
Expand Down

5 changes: 4 additions & 1 deletion
sources/LocalizationEditor/Providers/LocalizationsDataSource.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,7 +184,10 @@ final class LocalizationsDataSource: NSObject {
 guard let key = getKey(row: row), let part = data[key], let languageKey = mainLocalization?.language else {
 return nil
 }
 return part[languageKey]??.message
 guard let message = part[languageKey]??.message, !message.contains("\n ") else {
 return nil
 }
 return message
 }

 /**
Expand Down

6 changes: 3 additions & 3 deletions
sources/LocalizationEditor/UI/Base.lproj/Main.storyboard

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
 <dependencies>
 <deployment identifier="macosx"/>
 <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="20037"/>
 <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
 </dependencies>
 <scenes>
Expand DownExpand Up@@ -529,7 +529,7 @@ Gw
 </scene>
 </scenes>
 <resources>
 <image name="NSAddTemplate" width="14" height="13"/>
 <image name="NSAddTemplate" width="18" height="17"/>
 <image name="NSFolder" width="32" height="32"/>
 </resources>
</document>