Skip to content

Commit e3f703f

Browse files
committed
Resolve finding (2) from #1529:
- AccountController: change wording from "Shared by me" to "Shared with others" - ClientSharedByMeViewController: - change wording from "Shared by me" to "Shared with others" - remove duplicate section headers - Localizable.xcstrings: change localization key from "Shared by me" to "Shared with others"
1 parent 92a761c commit e3f703f

3 files changed

Lines changed: 23 additions & 27 deletions

File tree

ownCloud/Resources/Localizable.xcstrings

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -88492,24 +88492,24 @@
8849288492
}
8849388493
}
8849488494
},
88495-
"Shared by me" : {
88495+
"Shared with others" : {
8849688496
"localizations" : {
8849788497
"ar" : {
8849888498
"stringUnit" : {
8849988499
"state" : "translated",
88500-
"value" : "Shared by me"
88500+
"value" : "Shared with others"
8850188501
}
8850288502
},
8850388503
"ca" : {
8850488504
"stringUnit" : {
8850588505
"state" : "translated",
88506-
"value" : "Shared by me"
88506+
"value" : "Shared with others"
8850788507
}
8850888508
},
8850988509
"cs" : {
8851088510
"stringUnit" : {
8851188511
"state" : "translated",
88512-
"value" : "Shared by me"
88512+
"value" : "Shared with others"
8851388513
}
8851488514
},
8851588515
"de" : {
@@ -88521,13 +88521,13 @@
8852188521
"en" : {
8852288522
"stringUnit" : {
8852388523
"state" : "translated",
88524-
"value" : "Shared by me"
88524+
"value" : "Shared with others"
8852588525
}
8852688526
},
8852788527
"en-GB" : {
8852888528
"stringUnit" : {
8852988529
"state" : "translated",
88530-
"value" : "Shared by me"
88530+
"value" : "Shared with others"
8853188531
}
8853288532
},
8853388533
"es" : {
@@ -88539,43 +88539,43 @@
8853988539
"fr" : {
8854088540
"stringUnit" : {
8854188541
"state" : "translated",
88542-
"value" : "Shared by me"
88542+
"value" : "Shared with others"
8854388543
}
8854488544
},
8854588545
"it" : {
8854688546
"stringUnit" : {
8854788547
"state" : "translated",
88548-
"value" : "Shared by me"
88548+
"value" : "Shared with others"
8854988549
}
8855088550
},
8855188551
"ko" : {
8855288552
"stringUnit" : {
8855388553
"state" : "translated",
88554-
"value" : "Shared by me"
88554+
"value" : "Shared with others"
8855588555
}
8855688556
},
8855788557
"lo" : {
8855888558
"stringUnit" : {
8855988559
"state" : "translated",
88560-
"value" : "Shared by me"
88560+
"value" : "Shared with others"
8856188561
}
8856288562
},
8856388563
"mk" : {
8856488564
"stringUnit" : {
8856588565
"state" : "translated",
88566-
"value" : "Shared by me"
88566+
"value" : "Shared with others"
8856788567
}
8856888568
},
8856988569
"nb-NO" : {
8857088570
"stringUnit" : {
8857188571
"state" : "translated",
88572-
"value" : "Shared by me"
88572+
"value" : "Shared with others"
8857388573
}
8857488574
},
8857588575
"nn-NO" : {
8857688576
"stringUnit" : {
8857788577
"state" : "translated",
88578-
"value" : "Shared by me"
88578+
"value" : "Shared with others"
8857988579
}
8858088580
},
8858188581
"pt-BR" : {
@@ -88587,13 +88587,13 @@
8858788587
"pt-PT" : {
8858888588
"stringUnit" : {
8858988589
"state" : "translated",
88590-
"value" : "Shared by me"
88590+
"value" : "Shared with others"
8859188591
}
8859288592
},
8859388593
"ru" : {
8859488594
"stringUnit" : {
8859588595
"state" : "translated",
88596-
"value" : "Shared by me"
88596+
"value" : "Shared with others"
8859788597
}
8859888598
},
8859988599
"sq" : {
@@ -88605,25 +88605,25 @@
8860588605
"sv" : {
8860688606
"stringUnit" : {
8860788607
"state" : "translated",
88608-
"value" : "Shared by me"
88608+
"value" : "Shared with others"
8860988609
}
8861088610
},
8861188611
"th-TH" : {
8861288612
"stringUnit" : {
8861388613
"state" : "translated",
88614-
"value" : "Shared by me"
88614+
"value" : "Shared with others"
8861588615
}
8861688616
},
8861788617
"tr" : {
8861888618
"stringUnit" : {
8861988619
"state" : "translated",
88620-
"value" : "Shared by me"
88620+
"value" : "Shared with others"
8862188621
}
8862288622
},
8862388623
"zh-Hans" : {
8862488624
"stringUnit" : {
8862588625
"state" : "translated",
88626-
"value" : "Shared by me"
88626+
"value" : "Shared with others"
8862788627
}
8862888628
}
8862988629
}
@@ -108522,4 +108522,4 @@
108522108522
}
108523108523
},
108524108524
"version" : "1.0"
108525-
}
108525+
}

ownCloudAppShared/Client/Account/Controller/AccountController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ public class AccountController: NSObject, OCDataItem, OCDataItemVersioning, Acco
366366
}
367367

368368
if specialItems[.sharedByMe] == nil {
369-
specialItems[.sharedByMe] = CollectionSidebarAction(with: OCLocalizedString("Shared by me", nil), icon: OCSymbol.icon(forSymbolName: "arrowshape.turn.up.right"), identifier: specialItemsDataReferences[.sharedByMe], viewControllerProvider: { [weak self] context, action in
369+
specialItems[.sharedByMe] = CollectionSidebarAction(with: OCLocalizedString("Shared with others", nil), icon: OCSymbol.icon(forSymbolName: "arrowshape.turn.up.right"), identifier: specialItemsDataReferences[.sharedByMe], viewControllerProvider: { [weak self] context, action in
370370
return self?.provideViewController(for: .sharedByMe, in: context)
371371
}, cacheViewControllers: false)
372372
}

ownCloudAppShared/Client/View Controllers/ClientSharedByMeViewController.swift

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class ClientSharedByMeViewController: CollectionViewController {
3636
})
3737
super.init(context: context, sections: nil, useStackViewRoot: true)
3838
revoke(in: inContext, when: [ .connectionClosed ])
39-
navigationItem.titleLabelText = (byMe && !byLink) ? OCLocalizedString("Shared by me", nil) : ((!byMe && byLink) ? OCLocalizedString("Shared by link", nil) : OCLocalizedString("Shared", nil))
39+
navigationItem.titleLabelText = (byMe && !byLink) ? OCLocalizedString("Shared with others", nil) : ((!byMe && byLink) ? OCLocalizedString("Shared by link", nil) : OCLocalizedString("Shared", nil))
4040
}
4141

4242
required public init?(coder: NSCoder) {
@@ -59,10 +59,6 @@ class ClientSharedByMeViewController: CollectionViewController {
5959
section.hideIfEmptyDataSource = contentDataSource
6060
section.hidden = true
6161

62-
section.boundarySupplementaryItems = [
63-
.title(title, pinned: true)
64-
]
65-
6662
return section
6763
}
6864

@@ -80,7 +76,7 @@ class ClientSharedByMeViewController: CollectionViewController {
8076
var sectionsToAdd: [CollectionViewSection] = []
8177

8278
if hasByMeSection, let byMeDataSource = clientContext?.core?.sharedByMeGroupedDataSource {
83-
sharedByMeSection = buildSection(identifier: "byMe", titled: OCLocalizedString("Shared by me", nil), contentDataSource: byMeDataSource)
79+
sharedByMeSection = buildSection(identifier: "byMe", titled: OCLocalizedString("Shared with others", nil), contentDataSource: byMeDataSource)
8480
sectionsToAdd.append(sharedByMeSection!)
8581

8682
addNoItemsCondition(imageName: "arrowshape.turn.up.right", title: OCLocalizedString("No items shared by you", nil), datasource: byMeDataSource)

0 commit comments

Comments
 (0)